117 files changed, 37456 insertions, 39202 deletions

diff --git a/.gitignore b/.gitignore
index 8421cb18b..ad107c9ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,5 @@ compile
 cscope.out
 tags
 TAGS
-gnome-doc-utils.make
 ABOUT-NLS
 config.rpath
diff --git a/NEWS b/NEWS
index df6866024..d8a919eb8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,45 @@
+NEW in 3.3.5 (06/02/2012)
+============
+Bugs fixed:
+ - Fixed #667037, Crash when editing contacts (Guillaume Desmottes)
+ - Fixed #562462, "Open new chats in separate windows" has no obvious opposite (Danielle Madeley)
+ - Fixed #575669, Join Chatroom lists all accounts (Will Thompson)
+ - Fixed #576912, Highlights me in 1-1 conversations for no reason. (Will Thompson)
+ - Fixed #591667, Improve highlighting messages containing your nickname. (Will Thompson)
+ - Fixed #591756, Warn the user before leaving chat rooms (Will Thompson)
+ - Fixed #612216, Default conversation window size is too small (Ken VanDine)
+ - Fixed #643699, empathy-auth-client window should be modal to the desktop (Guillaume Desmottes)
+ - Fixed #660856, can't add a jabber account without a tld in username (Guillaume Desmottes)
+ - Fixed #662916, Empathy keeps scrolling up (Guillaume Desmottes)
+ - Fixed #666522, Notification unsure if a contact is coming or going (Guillaume Desmottes)
+ - Fixed #666714, Personal Information dialog for my XMPP account has a number of glitches (Guillaume Desmottes)
+ - Fixed #668336, Remove Edit -> Personnal information (Guillaume Desmottes)
+ - Fixed #668372, Adding a second Gmail account lists this account twice (Guillaume Desmottes)
+ - Fixed #668498, Stop watching connectivity change (Guillaume Desmottes)
+ - Fixed #668502, "No topic defined" displayed when reconnecting a private chat (Guillaume Desmottes)
+ - Fixed #668663, The default value of "sort-criterium" is NOT consistent with the description. (Guillaume Desmottes)
+ - Fixed #668681, empathy-auth-client window doesn't have proper name (Danielle Madeley)
+ - Fixed #668796, Is someone in Favourite/Favorite People really "Ungrouped" (Danielle Madeley)
+ - Fixed #669300, accounts assistant: salut widget has Close and Apply buttons (Guillaume Desmottes)
+ - Fixed #667467, Remove about Add New Preset section on the Saved Presets box (Yasumichi Akahoshi)
+ - Fixed #668364, I forgot to remove an unnecessary adjective (Yasumichi Akahoshi)
+
+Translations:
+ - Updated cs Translation (Marek Černocký)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated sl Translation (Matej Urban�i�)
+ - Updated sv Translation (Daniel Nylander)
+ - Updated te Translation (Praveen Illa)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
+Documentation translations:
+ - Updated es Documentation translation (Daniel Mustieles)
+ - Updated gl Documentation translation (Fran Diéguez)
+
 NEW in 3.3.4 (16/01/2012)
 ============
 
diff --git a/configure.ac b/configure.ac
index 939237800..68e50444b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [3])
-m4_define([empathy_micro_version], [4])
+m4_define([empathy_micro_version], [5])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -44,7 +44,7 @@ GCR_REQUIRED=2.91.4
 LIBCANBERRA_GTK_REQUIRED=0.25
 LIBNOTIFY_REQUIRED=0.7.0
 TELEPATHY_FARSIGHT_REQUIRED=0.0.18
-TELEPATHY_GLIB_REQUIRED=0.17.3
+TELEPATHY_GLIB_REQUIRED=0.17.5
 TELEPATHY_LOGGER=0.2.10
 WEBKIT_REQUIRED=1.3.13
 GOA_REQUIRED=3.3.0
@@ -71,6 +71,9 @@ CHAMPLAIN_REQUIRED=0.12.1
 # those warnings later during the cycle (bgo #662662)
 AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated])
 
+# FIXME: bgo #669673
+AC_DEFINE(CLUTTER_DISABLE_DEPRECATION_WARNINGS, 1, [Build with Clutter deprecated])
+
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -94,7 +97,6 @@ AC_PATH_XTRA
 LT_PREREQ([2.2])
 LT_INIT
 
-GNOME_DOC_INIT([0.17.3])
 AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
 GLIB_GSETTINGS
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
@@ -632,6 +634,8 @@ else
 fi
 AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
 
+# Help documentation
+YELP_HELP_INIT
 
 # -----------------------------------------------------------
 # Coding style checks
diff --git a/data/org.gnome.Empathy.gschema.xml.in b/data/org.gnome.Empathy.gschema.xml.in
index f3975fce2..8e7d9fd1b 100644
--- a/data/org.gnome.Empathy.gschema.xml.in
+++ b/data/org.gnome.Empathy.gschema.xml.in
@@ -88,12 +88,17 @@ present them to the user immediately.</_description>
       <_summary>The position for the chat window side pane</_summary>
       <_description>The stored position (in pixels) of the chat window side pane.</_description>
     </key>
+    <key name="show-groups" type="b">
+      <default>true</default>
+      <_summary>Show contact groups</_summary>
+      <_description>Whether to show groups in the contact list.</_description>
+    </key>
   </schema>
   <schema id="org.gnome.Empathy.contacts" path="/org/gnome/empathy/contacts/">
     <key name="sort-criterium" type="s">
       <default>'state'</default>
       <_summary>Contact list sort criterion</_summary>
-      <_description>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.</_description>
+      <_description>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.</_description>
     </key>
   </schema>
   <schema id="org.gnome.Empathy.sounds" path="/org/gnome/empathy/sounds/">
@@ -201,6 +206,11 @@ present them to the user immediately.</_description>
       <_summary>Enable WebKit Developer Tools</_summary>
       <_description>Whether WebKit developer tools, such as the Web Inspector, should be enabled.</_description>
     </key>
+    <key name="send-chat-states" type="b">
+      <default>true</default>
+      <_summary>Inform other users when you are typing to them</_summary>
+      <_description>Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state.</_description>
+    </key>
     <key name="theme-chat-room" type="b">
       <default>true</default>
       <_summary>Use theme for chat rooms</_summary>
diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page
index 2a85f1567..f4be7bbba 100644
--- a/help/C/irc-manage.page
+++ b/help/C/irc-manage.page
@@ -2,8 +2,7 @@
       xmlns:e="http://projectmallard.org/experimental/"
       xmlns:if="http://projectmallard.org/experimental/if/"
       type="guide" style="2column"
-      id="irc-manage"
-      groups="one two">
+      id="irc-manage">
 
   <info>
     <link type="guide" xref="index#text-conv"/>
diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page
index f503073ef..ae93883f4 100644
--- a/help/C/set-custom-status.page
+++ b/help/C/set-custom-status.page
@@ -63,7 +63,7 @@
     <item>
       <p>
         If you want to set the custom message as a favorite, saving it in order to use it
-        again, click on the little star on the right of the text box where you wrote your
+        again, click on the little heart on the right of the text box where you wrote your
         custom message.
       </p>
       <p>
@@ -75,7 +75,7 @@
 
   <section id="edit-custom">
 
-  <title>Edit, remove and add a custom message</title>
+  <title>Edit and remove a custom message</title>
 
   <steps>
     <item>
@@ -127,29 +127,6 @@
             </item>
           </steps>
         </item>
-        <item>
-          <p>
-            To add a new custom message, from the <gui>Add New Preset</gui> section:
-          </p>
-          <steps>
-            <item>
-              <p>
-                Click on the drop-down list to select the status you want to set a custom
-                message to.
-              </p>
-            </item>
-            <item>
-              <p>
-                Click on the text box, and type the new custom message.
-              </p>
-            </item>
-            <item>
-              <p>
-                Click on <gui>Add</gui> to add the new message to the presets ones.
-              </p>
-            </item>
-          </steps>
-        </item>
       </list>
     </item>
     <item>
@@ -161,7 +138,7 @@
 
   <note style="tip">
     <p>
-      When you edit or add a new custom message, it will not be set as the current
+      When you edit a custom message, it will not be set as the current
       status message. You will need to select it from the <gui>Contact List</gui> window.
     </p>
   </note>
diff --git a/help/Makefile.am b/help/Makefile.am
index 45aa010cc..9bde991d4 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,7 +1,6 @@
-include $(top_srcdir)/gnome-doc-utils.make
 
-DOC_ID = empathy
-DOC_FIGURES = \
+HELP_ID = empathy
+HELP_MEDIA = \
 	figures/audio-input-microphone.png \
 	figures/available.png \
 	figures/away.png \
@@ -14,7 +13,7 @@ DOC_FIGURES = \
 	figures/gtk-remove.png \
 	figures/offline.png
 
-DOC_PAGES = \
+HELP_FILES = \
 	account-irc.page \
 	account-jabber.page \
 	accounts-window.page \
@@ -61,5 +60,4 @@ DOC_PAGES = \
 	status-icons.page \
 	video-call.page
 
-DOC_LINGUAS = ca cs de el en_GB es eu fi fr gl hu it pl ru sl sv zh_CN
-dist-hook: doc-dist-hook
+HELP_LINGUAS = ca cs de el en_GB es eu fi fr gl hu it pl ru sl sv zh_CN
diff --git a/help/de/de.po b/help/de/de.po
index 4f6e78c5f..652317801 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -4,16 +4,16 @@
 # documentation package.
 #
 # Philipp Kerling <k.philipp@gmail.com>, 2008.
-# Mario Blättermann <mariobl@freenet.de>, 2008-2011.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2008-2012.
 # Christian Kirbach  <Christian.Kirbach@googlemail.com>, 2009, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy help master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-05 18:45+0000\n"
-"PO-Revision-Date: 2011-09-06 20:40+0100\n"
-"Last-Translator: Mario Blättermann <mariobl@freenet.de>\n"
+"POT-Creation-Date: 2012-02-19 10:32+0000\n"
+"PO-Revision-Date: 2012-02-19 12:54+0100\n"
+"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,1883 +22,1794 @@ msgstr ""
 "X-Poedit-Country: GERMANY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:38(None) C/audio-video.page:70(None)
-#: C/audio-call.page:36(None)
-msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr ""
+"Mario Blättermann <mario.blaettermann@gmail.com>, 2008-2012\n"
+"Philipp Kerling <k.philipp@gmail.com>, 2008\n"
+"Christian Kirbach <Christian.Kirbach@googlemail.com>, 2010-2012"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:28(media)
+msgctxt "_"
+msgid ""
+"external ref='figures/empathy-logo.png' "
+"md5='1afc419a644e90b16393807e35cb5cb2'"
 msgstr "original"
 
-#: C/video-call.page:10(desc)
-msgid "Start a video conversation with one of your contacts."
-msgstr "Beginnen Sie eine Videounterhaltung mit einem Ihrer Kontakte."
+#: C/index.page:7(info/title)
+msgctxt "link"
+msgid "Empathy Internet Messenger"
+msgstr "Empathy Internet-Nachrichtendienst"
+
+#: C/index.page:8(info/title)
+msgctxt "text"
+msgid "Empathy Internet Messenger"
+msgstr "Empathy Internet-Nachrichtendienst"
 
-#: C/video-call.page:21(name) C/status-icons.page:16(name)
-#: C/share-desktop.page:14(name) C/set-custom-status.page:19(name)
-#: C/send-file.page:21(name) C/salut-protocol.page:18(name)
-#: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
-#: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
-#: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
-#: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
-#: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
-#: C/irc-manage.page:20(name) C/irc-join-room.page:16(name)
-#: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name)
-#: C/introduction.page:13(name) C/index.page:19(name)
-#: C/import-account.page:23(name) C/hide-contacts.page:11(name)
-#: C/group-conversations.page:19(name) C/geolocation-what-is.page:18(name)
-#: C/geolocation-turn.page:18(name) C/geolocation-supported.page:16(name)
-#: C/geolocation-privacy.page:17(name) C/geolocation-not-showing.page:17(name)
-#: C/geolocation.page:17(name) C/favorite-rooms.page:14(name)
-#: C/disable-account.page:20(name) C/create-account.page:19(name)
-#: C/audio-video.page:17(name) C/audio-call.page:19(name)
-#: C/add-account.page:20(name)
+#: C/index.page:19(credit/name) C/add-account.page:21(credit/name)
+#: C/audio-call.page:19(credit/name) C/audio-video.page:17(credit/name)
+#: C/create-account.page:19(credit/name)
+#: C/disable-account.page:21(credit/name)
+#: C/favorite-rooms.page:14(credit/name) C/geolocation.page:17(credit/name)
+#: C/geolocation-not-showing.page:17(credit/name)
+#: C/geolocation-privacy.page:17(credit/name)
+#: C/geolocation-supported.page:16(credit/name)
+#: C/geolocation-turn.page:18(credit/name)
+#: C/geolocation-what-is.page:18(credit/name)
+#: C/group-conversations.page:19(credit/name)
+#: C/hide-contacts.page:11(credit/name) C/import-account.page:23(credit/name)
+#: C/introduction.page:13(credit/name) C/irc-commands.page:10(credit/name)
+#: C/irc-join-pwd.page:17(credit/name) C/irc-join-room.page:16(credit/name)
+#: C/irc-manage.page:19(credit/name) C/irc-nick-password.page:18(credit/name)
+#: C/irc-send-file.page:16(credit/name)
+#: C/irc-start-conversation.page:15(credit/name)
+#: C/link-contacts.page:15(credit/name) C/prev-conv.page:17(credit/name)
+#: C/prob-conn-acctdisabled.page:19(credit/name)
+#: C/prob-conn-auth.page:21(credit/name) C/prob-conn-name.page:18(credit/name)
+#: C/prob-conn-neterror.page:19(credit/name)
+#: C/remove-account.page:19(credit/name) C/salut-protocol.page:18(credit/name)
+#: C/send-file.page:21(credit/name) C/set-custom-status.page:19(credit/name)
+#: C/share-desktop.page:14(credit/name) C/status-icons.page:16(credit/name)
+#: C/video-call.page:22(credit/name)
 msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
-#: C/video-call.page:22(email) C/status-icons.page:17(email)
-#: C/share-desktop.page:15(email) C/set-custom-status.page:20(email)
-#: C/send-file.page:22(email) C/salut-protocol.page:19(email)
-#: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
-#: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
-#: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
-#: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
-#: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
-#: C/irc-manage.page:21(email) C/irc-join-room.page:17(email)
-#: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email)
-#: C/introduction.page:14(email) C/index.page:20(email)
-#: C/import-account.page:24(email) C/hide-contacts.page:12(email)
-#: C/group-conversations.page:20(email) C/geolocation-what-is.page:19(email)
-#: C/geolocation-turn.page:19(email) C/geolocation-supported.page:17(email)
-#: C/geolocation-privacy.page:18(email)
-#: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
-#: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
-#: C/create-account.page:20(email) C/audio-video.page:18(email)
-#: C/audio-call.page:20(email) C/add-account.page:21(email)
-msgid "milo@ubuntu.com"
-msgstr "milo@ubuntu.com"
-
-#: C/video-call.page:25(p) C/status-icons.page:24(p) C/share-desktop.page:22(p)
-#: C/set-custom-status.page:23(p) C/send-message.page:21(p)
-#: C/send-file.page:25(p) C/salut-protocol.page:22(p)
-#: C/remove-account.page:22(p) C/prob-conn.page:18(p)
-#: C/prob-conn-neterror.page:22(p) C/prob-conn-name.page:21(p)
-#: C/prob-conn-auth.page:25(p) C/prob-conn-acctdisabled.page:22(p)
-#: C/prev-conv.page:24(p) C/link-contacts.page:19(p)
-#: C/irc-start-conversation.page:19(p) C/irc-send-file.page:20(p)
-#: C/irc-nick-password.page:22(p) C/irc-manage.page:24(p)
-#: C/irc-join-room.page:20(p) C/irc-join-pwd.page:21(p)
-#: C/irc-commands.page:14(p) C/introduction.page:17(p) C/index.page:23(p)
-#: C/import-account.page:31(p) C/hide-contacts.page:15(p)
-#: C/group-conversations.page:23(p) C/geolocation-what-is.page:22(p)
-#: C/geolocation-turn.page:22(p) C/geolocation-supported.page:20(p)
-#: C/geolocation-privacy.page:21(p) C/geolocation-not-showing.page:21(p)
-#: C/geolocation.page:21(p) C/favorite-rooms.page:18(p)
-#: C/disable-account.page:28(p) C/create-account.page:23(p)
-#: C/change-status.page:23(p) C/audio-video.page:21(p) C/audio-call.page:23(p)
-#: C/add-contact.page:22(p) C/add-account.page:28(p)
-#: C/accounts-window.page:22(p) C/account-jabber.page:18(p)
-#: C/account-irc.page:20(p)
+#: C/index.page:23(license/p) C/account-irc.page:20(license/p)
+#: C/account-jabber.page:18(license/p) C/accounts-window.page:22(license/p)
+#: C/add-account.page:29(license/p) C/add-contact.page:22(license/p)
+#: C/audio-call.page:23(license/p) C/audio-video.page:21(license/p)
+#: C/change-status.page:28(license/p) C/create-account.page:23(license/p)
+#: C/disable-account.page:29(license/p) C/favorite-rooms.page:18(license/p)
+#: C/geolocation.page:21(license/p)
+#: C/geolocation-not-showing.page:21(license/p)
+#: C/geolocation-privacy.page:21(license/p)
+#: C/geolocation-supported.page:20(license/p)
+#: C/geolocation-turn.page:22(license/p)
+#: C/geolocation-what-is.page:22(license/p)
+#: C/group-conversations.page:23(license/p) C/hide-contacts.page:15(license/p)
+#: C/import-account.page:31(license/p) C/introduction.page:17(license/p)
+#: C/irc-commands.page:14(license/p) C/irc-join-pwd.page:21(license/p)
+#: C/irc-join-room.page:20(license/p) C/irc-manage.page:23(license/p)
+#: C/irc-nick-password.page:22(license/p) C/irc-send-file.page:20(license/p)
+#: C/irc-start-conversation.page:19(license/p)
+#: C/link-contacts.page:19(license/p) C/prev-conv.page:25(license/p)
+#: C/prob-conn-acctdisabled.page:23(license/p)
+#: C/prob-conn-auth.page:25(license/p) C/prob-conn-name.page:22(license/p)
+#: C/prob-conn-neterror.page:23(license/p) C/prob-conn.page:18(license/p)
+#: C/remove-account.page:23(license/p) C/salut-protocol.page:22(license/p)
+#: C/send-file.page:25(license/p) C/send-message.page:21(license/p)
+#: C/set-custom-status.page:23(license/p) C/share-desktop.page:22(license/p)
+#: C/status-icons.page:24(license/p) C/video-call.page:26(license/p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Share Alike 3.0"
 
-#: C/video-call.page:28(title)
-msgid "Start a video conversation"
-msgstr "Eine Video-Unterhaltung beginnen"
-
-#: C/video-call.page:30(p)
-msgid ""
-"If you have a webcam, you can call your contacts and have a video "
-"conversation with them. This features only works with certain types of "
-"accounts, and it requires the other person to have an application that "
-"supports video calls."
-msgstr ""
-"Falls Sie über eine Webcam verfügen, können Sie Ihre Kontakte für eine "
-"Videounterhaltung anrufen. Dieses Funktionsmerkmal steht nur für bestimmte "
-"Kontentypen zur Verfügung. Außerdem muss die andere Person mit einer "
-"Anwendung arbeiten, die Videoanrufe unterstützt."
-
-#: C/video-call.page:37(p)
+#: C/index.page:27(page/title)
 msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" mime="
-"\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next to "
-"the name of the contact you wish to call and choose <gui style=\"menuitem"
-"\">Video Call</gui>."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
 msgstr ""
-"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-Symbol "
-"neben dem Namen des Kontakts, den Sie anrufen wollen, und wählen Sie <gui "
-"style=\"menuitem\">Videoanruf</gui>."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+"\">Empathy Internet-Nachrichtendienst-Logo</media> Empathy Internet-"
+"Nachrichtendienst"
 
-#: C/video-call.page:43(p) C/audio-call.page:42(p)
-msgid ""
-"A new window will open. When the connection is established, you will see "
-"<gui>Connected</gui> at the bottom of the window, along with the total "
-"conversation time."
-msgstr ""
-"Ein neues Fenster wird geöffnet. Sobald die Verbindung aufgebaut wurde, sehen "
-"Sie am unteren Rand des Fensters <gui>Verbunden</gui> und die Gesamtzeit der "
-"Unterhaltung."
+#: C/index.page:35(section/title)
+msgid "Account Management"
+msgstr "Kontenverwaltung"
 
-#: C/video-call.page:48(p) C/audio-call.page:48(p)
-msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
-msgstr ""
-"Um eine Unterhaltung zu beenden, klicken Sie auf <gui style=\"button"
-"\">Auflegen</gui>."
+#: C/index.page:39(section/title)
+msgid "Contact Management"
+msgstr "Kontaktverwaltung"
 
-#: C/video-call.page:54(p)
-msgid ""
-"To turn a video conversation into an audio conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
-msgstr ""
-"Um eine Video-Unterhaltung in eine Audio-Unterhaltung umzuwandeln, wählen Sie "
-"<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video aus</"
-"gui></guiseq>."
+#: C/index.page:43(section/title)
+msgid "Text Conversations"
+msgstr "Text-Unterhaltungen"
 
-#: C/video-call.page:60(title)
-msgid "Start a video conversation with a meta-contact"
-msgstr "Beginnen einer Videounterhaltung mit einem Meta-Kontakt"
+#: C/index.page:47(section/title)
+msgid "Audio and Video Conversations"
+msgstr "Audio- und Video-Unterhaltungen"
 
-#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p)
-msgid ""
-"From the <gui>Contact List</gui> window, right-click on the meta-contact."
-msgstr "Klicken Sie im<gui>Kontaktlisten</gui>-Fenster auf den Meta-Kontakt."
+#: C/index.page:51(section/title)
+msgid "Advanced Actions"
+msgstr "Fortgeschrittene Aktionen"
 
-#: C/video-call.page:68(p)
-msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Video Call</gui>."
-msgstr ""
-"Wählen Sie den Kontakt aus, mit dem Sie eine Unterhaltung beginnen wollen, "
-"und wählen Sie im Menü  <gui style=\"menuitem\">Videoanruf</gui>."
+#: C/index.page:55(section/title) C/irc-manage.page:57(section/title)
+msgid "Common Problems"
+msgstr "Häufig auftretende Probleme"
 
-#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/account-irc.page:106(media)
+msgctxt "_"
 msgid ""
-"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
-"contact in the <gui>Contact List</gui> window, and stop over it for a second: "
-"a small pop-up message will appear showing the number of the contacts that "
-"form the meta-contact."
-msgstr ""
-"Bewegen und halten Sie den Mauszeiger über einen Kontakt im Fenster "
-"<gui>Kontaktliste</gui>, um erkennen zu können, ob es sich um einen <em>Meta-"
-"Kontakt</em> handelt. Nach kurzer Zeit erscheint eine Einblendung, die die "
-"Anzahl der Einzelkontakte nennt."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:39(None)
-msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
+"external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'"
 msgstr "original"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:45(None)
-msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/account-irc.page:109(media) C/prob-conn-auth.page:58(media)
+#: C/prob-conn-name.page:44(media) C/prob-conn-neterror.page:59(media)
+msgctxt "_"
+msgid ""
+"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'"
 msgstr "original"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:53(None)
-msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
-msgstr "original"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:62(None) C/status-icons.page:69(None)
-msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/account-irc.page:112(media)
+msgctxt "_"
+msgid ""
+"external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'"
 msgstr "original"
 
-#: C/status-icons.page:7(desc)
-msgid "Understanding the various statuses and status icons."
-msgstr "Erläuterung der verschiedenen Status und deren Symbole."
+#: C/account-irc.page:8(info/desc)
+msgid "Additional information necessary for connecting to IRC networks."
+msgstr ""
+"Zusätzlich erforderliche Informationen für Verbindungen zu IRC-Netzwerken."
 
-#: C/status-icons.page:20(name) C/salut-protocol.page:36(cite)
-#: C/prev-conv.page:20(name) C/prev-conv.page:38(cite)
-#: C/import-account.page:27(name) C/disable-account.page:24(name)
-#: C/audio-video.page:109(cite) C/audio-video.page:117(cite)
-#: C/add-account.page:24(name) C/accounts-window.page:18(name)
-#: C/account-jabber.page:14(name) C/account-irc.page:16(name)
+#: C/account-irc.page:16(credit/name) C/account-jabber.page:14(credit/name)
+#: C/accounts-window.page:18(credit/name) C/add-account.page:25(credit/name)
+#: C/disable-account.page:25(credit/name)
+#: C/import-account.page:27(credit/name) C/prev-conv.page:21(credit/name)
+#: C/status-icons.page:20(credit/name)
 msgid "Shaun McCance"
 msgstr "Shaun McCance"
 
-#: C/status-icons.page:21(email) C/prev-conv.page:21(email)
-#: C/import-account.page:28(email) C/disable-account.page:25(email)
-#: C/add-account.page:25(email) C/accounts-window.page:19(email)
-#: C/account-jabber.page:15(email) C/account-irc.page:17(email)
-msgid "shaunm@gnome.org"
-msgstr "shaunm@gnome.org"
+#: C/account-irc.page:31(page/title)
+msgid "IRC account details"
+msgstr "IRC-Kontendetails"
 
-#: C/status-icons.page:35(title)
-msgid "Status Types and Icons"
-msgstr "Typen des Anwesenheitsstatus und Symbole"
+#: C/account-irc.page:33(page/p)
+msgid ""
+"IRC accounts require different information than many other types of "
+"accounts. To create an IRC account, you must specify at least an IRC network "
+"and a nickname. This page details the information you can provide for an IRC "
+"account."
+msgstr ""
+"IRC-Konten erfordern andere Informationen als die meisten anderen "
+"Kontentypen. Um ein IRC-Konto zu erstellen, müssen Sie mindestens ein IRC-"
+"Netzwerk und einen Spitznamen angeben. Diese Seite erläutert die "
+"Informationen, die Sie für ein IRC-Konto angeben können."
 
-#: C/status-icons.page:39(media)
-msgid "Available icon"
-msgstr "Symbol »Verfügbar«"
+#: C/account-irc.page:39(note/p) C/irc-manage.page:37(note/p)
+msgid ""
+"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
+"<app>Empathy</app>."
+msgstr ""
+"Sie müssen das Paket <sys>telepathy-idle</sys> installiert haben, um das IRC "
+"in <app>Empathy</app> nutzen zu können."
 
-#: C/status-icons.page:40(gui)
-msgid "Available"
-msgstr "Verfügbar"
+#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title)
+msgid "<gui>Network</gui>"
+msgstr "<gui>Netzwerk</gui>"
 
-#: C/status-icons.page:41(p)
+#: C/account-irc.page:46(item/p)
 msgid ""
-"Use the <em>Available</em> status when you are at your computer and able to "
-"chat with your contacts. You can set a custom message for this status."
+"IRC is an open system that allows people to run separate IRC networks. Each "
+"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
+"lists the most popular networks in the <gui>Network</gui> drop-down list. "
+"You can add additional networks. See <link xref=\"#networks\"/> below."
 msgstr ""
-"Verwenden Sie den Status <em>Verfügbar</em>, wenn Sie sich an Ihrem Rechner "
-"befinden und somit Unterhaltungen mit Ihren Kontakten führen können. Sie "
-"können für diesen Status eine benutzerdefinierte Nachricht festlegen."
-
-#: C/status-icons.page:45(media)
-msgid "Busy icon"
-msgstr "Symbol »Beschäftigt«"
+"IRC ist ein offenes System, welches Personen erlaubt, separate IRC-Netzwerke "
+"zu betreiben. Jedes Netzwerk ist in sich abgeschlossen und hat seine eigenen "
+"Benutzer und Unterhaltungsräume. <app>Empathy</app> listet die populärsten "
+"Netzwerke in der Auswahlliste <gui>Netzwerk</gui> auf. Sie können "
+"zusätzliche Netzwerke hinzufügen. Siehe <link xref=\"#networks\"/> "
+"nachfolgend."
 
-#: C/status-icons.page:46(gui)
-msgid "Busy"
-msgstr "Beschäftigt"
+#: C/account-irc.page:53(item/title)
+msgid "<gui>Nickname</gui>"
+msgstr "<gui>Spitzname</gui>"
 
-#: C/status-icons.page:47(p)
+#: C/account-irc.page:54(item/p)
 msgid ""
-"Use the <em>Busy</em> status to let your contacts know that you don’t want to "
-"chat right now. They can still contact you, for instance if they have "
-"something urgent they need to discuss. By default, <app>Empathy</app> will "
-"not use notification bubbles and sounds when you are busy. You can set a "
-"custom message for this status."
+"Your nickname is your unique name on the IRC network. Only one person on a "
+"network may use a given nickname. If you get an error message that says "
+"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change "
+"your nickname."
 msgstr ""
-"Verwenden Sie den Status <em>Beschäftigt</em>, wenn Sie Ihre Kontakte darüber "
-"informieren wollen, dass Sie gerade keine Unterhaltung wünschen. Diese können "
-"Sie trotzdem noch kontaktieren, beispielsweise in dringenden Fällen. Per "
-"Vorgabe zeigt <app>Empathy</app> keine einblendenden Benachrichtigungen an "
-"oder spielt Klänge ab, wenn Sie beschäftigt sind. Sie können für diesen "
-"Status eine benutzerdefinierte Nachricht festlegen."
-
-#: C/status-icons.page:53(media)
-msgid "Away icon"
-msgstr "Symbol »Abwesend«"
+"Ihr Spitzname ist Ihr eindeutiger Name im IRC-Netzwerk. Nur eine einzige "
+"Person in einem Netzwerk darf einen gegebenen Spitznamen verwenden. Falls "
+"Sie die Fehlermeldung <link xref=\"prob-conn-name\" role=\"error-msg\"/> "
+"erhalten, müssen Sie Ihren Spitznamen ändern."
 
-#: C/status-icons.page:54(gui)
-msgid "Away"
-msgstr "Abwesend"
+#: C/account-irc.page:60(item/title)
+msgid "<gui>Password</gui>"
+msgstr "<gui>Passwort</gui>"
 
-#: C/status-icons.page:55(p)
+#: C/account-irc.page:61(item/p)
 msgid ""
-"Use the <em>Away</em> status when you are going away from your computer. "
-"<app>Empathy</app> automatically sets your status to Away if you do not use "
-"your computer for a while, or if your screensaver is on. By default, "
-"<app>Empathy</app> will not use notification bubbles and sounds when you are "
-"away. You can set a custom message for this status."
+"Some servers, particularly those on private networks, require a password to "
+"connect. If you are authorized to use the network, the network "
+"administrators should provide you with a password."
 msgstr ""
-"Verwenden Sie den Status <em>Beschäftigt</em>, wenn Sie sich von Ihrem "
-"Rechner entfernen. <app>Empathy</app> setzt Ihren Status automatisch auf "
-"abwesend, wenn Sie Ihren Rechner für einen gewissen Zeitraum nicht bedienen "
-"oder wenn der Bildschirmschoner eingeschaltet ist. <app>Empathy</app> zeigt "
-"keine einblendenden Benachrichtigungen an oder spielt Klänge ab, wenn Sie "
-"abwesend sind. Sie können für diesen Status eine benutzerdefinierte Nachricht "
-"festlegen."
-
-#: C/status-icons.page:62(media) C/status-icons.page:69(media)
-msgid "Offline icon"
-msgstr "Symbol »Abgemeldet«"
+"Einige Server, insbesondere diejenigen in privaten Netzwerken, erfordern ein "
+"Passwort für die Verbindung. Falls Sie legitimiert sind, das Netzwerk zu "
+"benutzen, sollte Sie Ihnen dessen Verwalter ein Passwort zur Verfügung "
+"gestellt haben."
 
-#: C/status-icons.page:63(gui)
-msgid "Invisible"
-msgstr "Unsichtbar"
+#: C/account-irc.page:65(note/title)
+msgid "NickServ Passwords"
+msgstr "NickServ-Passwörter"
 
-#: C/status-icons.page:64(p)
+#: C/account-irc.page:66(note/p)
 msgid ""
-"When you set your status to <em>Invisible</em>, you will appear as offline to "
-"your contacts. You will still be connected to your accounts, and you still "
-"see your contacts’ statuses and start conversations with them."
+"On some networks, nicknames can be registered using a service known as "
+"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
+"On some networks, including the popular freenode network, server passwords "
+"are automatically forwarded to NickServ, allowing you to set this field to "
+"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
+"more details."
 msgstr ""
-"Wenn Sie Ihren Status auf <em>Unsichtbar</em> setzen, erscheinen Sie für Ihre "
-"Kontakte als abgemeldet. Sie sind noch immer mit Ihren Kontakten verbunden. "
-"Sie sehen deren Status und können Unterhaltungen mit Ihnen beginnen."
+"In einigen Netzwerken können Spitznamen mit einem Dienst namens NickServ "
+"registriert werden. <app>Empathy</app> unterstützt Passwörter für Spitznamen "
+"nicht direkt. In einigen Netzwerken, zum Beispiel FreeNode, werden "
+"Serverpasswörter automatisch an NickServ weitergeleitet, was Ihnen "
+"ermöglicht, sich mit diesem Feld bei NickServ zu identifizieren. Weitere "
+"Details hierzu finden Sie in <link xref=\"irc-nick-password\"/>"
 
-#: C/status-icons.page:70(gui)
-msgid "Offline"
-msgstr "Abgemeldet"
+#: C/account-irc.page:76(item/title)
+msgid "<gui>Real name</gui>"
+msgstr "<gui>Realer Name</gui>"
 
-#: C/status-icons.page:71(p)
+#: C/account-irc.page:77(item/p)
 msgid ""
-"Setting your status to <em>Offline</em> disconnects you from all of your "
-"accounts."
+"You can provide your real name in addition to your nickname. Other users "
+"will be able to see this when they view your information."
 msgstr ""
-"Wenn Sie Ihren Status auf <em>Abgemeldet</em> setzen, werden alle "
-"Verbindungen zu Ihren Kontakten getrennt."
+"Zusätzlich zu Ihrem Spitznamen können Sie auch Ihren echten Namen angeben. "
+"Dieser wird anderen Benutzern angezeigt, wenn diese Ihre persönlichen "
+"Informationen betrachten."
 
-#: C/share-desktop.page:7(desc)
-msgid "Show your desktop to your contacts."
-msgstr "Freigeben der Arbeitsumgebung für Ihre Kontakte."
+#: C/account-irc.page:81(item/title)
+msgid "<gui>Quit message</gui>"
+msgstr "<gui>Abmeldungsnachricht</gui>"
 
-#: C/share-desktop.page:18(name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
+#: C/account-irc.page:82(item/p)
+msgid ""
+"When you go offline, a quit message is sent to all the chat rooms you’re in "
+"and to all the users you’re having a private conversation with. Use this "
+"field to provide a custom quit message."
+msgstr ""
+"Wenn Sie sich abmelden, wird eine Abmeldungsnachricht an alle "
+"Unterhaltungsräume gesendet, in denen Sie sich befinden, sowie an alle "
+"Benutzer, mit denen Sie eine private Unterhaltung führen. Verwenden Sie "
+"dieses Feld, um eine benutzerdefinierte Nachricht bereitzustellen."
 
-#: C/share-desktop.page:19(email)
-msgid "kittykat3756@gmail.com"
-msgstr "kittykat3756@gmail.com"
+#: C/account-irc.page:94(info/title)
+msgctxt "link"
+msgid "IRC Networks"
+msgstr "IRC-Netzwerke"
 
-#: C/share-desktop.page:33(title)
-msgid "Share your desktop"
-msgstr "Freigabe Ihrer Arbeitsumgebung"
+#: C/account-irc.page:97(section/title)
+msgid "Networks"
+msgstr "Netzwerke"
 
-#: C/share-desktop.page:35(p)
+#: C/account-irc.page:99(section/p)
 msgid ""
-"It is possible to share your desktop with some of your contacts. You can use "
-"this functionality to show your desktop to your contacts to, for example, ask "
-"for help or help your contacts resolve a problem."
+"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
+"another IRC network, you can add it to the list. You can also modify "
+"networks and remove them from the list."
 msgstr ""
-"Es ist möglich, Ihre Arbeitsumgebung für einige Ihrer Kontakte freizugeben "
-"oder deren freigegebene Arbeitsumgebungen zu benutzen. Sie können auf diese "
-"Weise Ihre Arbeitsumgebung Ihren Kontakten zeigen, um ihnen bei der Lösung "
-"von Problemen zu helfen oder selbst um Hilfe zu bitten."
+"<app>Empathy</app> enthält eine Liste populärer IRC-Netzwerke. Falls Sie ein "
+"anderes IRC-Netzwerk wünschen, können Sie es zur Liste hinzufügen. Sie "
+"können auch Netzwerke bearbeiten oder aus der Liste entfernen."
 
-#: C/share-desktop.page:42(p)
+#: C/account-irc.page:104(item/p)
 msgid ""
-"To be able to share your desktop, you need to have a VNC server, which has "
-"support for the feature, installed on your system. <app>Vino</app>, the GNOME "
-"VNC server, has the required support."
+"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
+"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
 msgstr ""
-"Um Ihren Bildschirm freigeben zu können, benötigen Sie einen auf Ihrem System "
-"installierten VNC-Server, der dieses Funktionsmerkmal unterstützt. <app>Vino</"
-"app>, der VNC-Server von GNOME, verfügt über diese Funktionalität."
+"Um ein Netzwerk zur Liste hinzuzufügen, klicken Sie auf <media type=\"image"
+"\" mime=\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16"
+"\">Hinzufügen</media>."
 
-#: C/share-desktop.page:51(p)
-msgid "From the <gui>Contact List</gui> window, do one of the following:"
+#: C/account-irc.page:107(item/p)
+msgid ""
+"To modify a network in the list, select the network and click <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
+"height=\"16\">Edit</media>."
 msgstr ""
-"Führen Sie im <gui>Kontaktlisten</gui>-Fenster eine der folgenden Aktionen "
-"aus:"
+"Um ein Netzwerk in der Liste zu bearbeiten, wählen Sie es aus und klicken "
+"auf <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" "
+"width=\"16\" height=\"16\">Bearbeiten</media>."
 
-#: C/share-desktop.page:56(p)
+#: C/account-irc.page:110(item/p)
 msgid ""
-"Select the contact you want to share your desktop with and choose "
-"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></guiseq>."
+"To remove a network from the list, select the network and click <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
+"height=\"16\">Remove</media>."
 msgstr ""
-"Wählen Sie den Kontakt aus, für den Sie Ihre Arbeitsumgebung freigeben "
-"wollen, und wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Kontakt</"
-"gui><gui>Meine Arbeitsumgebung freigeben</gui></guiseq>."
+"Um ein Netzwerk aus der Liste zu entfernen, wählen Sie es aus und klicken "
+"auf <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" "
+"width=\"16\" height=\"16\">Entfernen</media>."
 
-#: C/share-desktop.page:63(p)
+#: C/account-irc.page:115(section/p)
 msgid ""
-"Right-click on the name of the contact you want to share your desktop with "
-"and select <gui>Share My Desktop</gui>."
+"When adding or modifying a network, you can enter the following information:"
 msgstr ""
-"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, für den Sie "
-"Ihre Arbeitsumgebung freigeben wollen und wählen Sie <gui>Meine "
-"Arbeitsumgebung freigeben</gui>."
+"Beim Hinzufügen oder Ändern eines Netzwerks können Sie die folgenden "
+"Informationen eingeben:"
 
-#: C/share-desktop.page:71(p)
+#: C/account-irc.page:121(item/p)
 msgid ""
-"An invitation to view your desktop will be sent to the contact you have "
-"selected. To view your desktop, they will need to accept it."
+"This is the name of the network as you want it to appear in the list of "
+"networks."
 msgstr ""
-"Eine Einladung zum Betrachten Ihres Bildschirms wird an die ausgewählten "
-"Kontakte gesendet. Um Ihren Bildschirm anzuzeigen, müssen die Kontakte diese "
-"akzeptieren."
+"Dies ist der Name des Netzwerks, so wie der in der Liste der Netzwerke "
+"erscheinen soll."
+
+#: C/account-irc.page:125(item/title)
+msgid "<gui>Charset</gui>"
+msgstr "<gui>Zeichensatz</gui>"
 
-#: C/share-desktop.page:77(p)
+#: C/account-irc.page:126(item/p)
 msgid ""
-"You can disconnect the contact from your computer using your desktop sharing "
-"application."
+"This specifies the character encoding that is typically used on this "
+"network. A character encoding is a specific way of recording characters "
+"internally in a computer. There are many character encodings, and you need "
+"to use the same character encoding as other users to see their messages "
+"correctly."
 msgstr ""
-"Sie können die Verbindung zum Kontakt über die Anwendung zur Freigabe Ihrer "
-"Arbeitsumgebung trennen."
+"Dies legt die Zeichenkodierung fest, die typischerweise in diesem Netzwerk "
+"verwendet wird. Eine Zeichenkodierung ist eine spezifische Art der internen "
+"Aufzeichnung von Zeichen in einem Rechner. Es gibt zahlreiche "
+"Zeichenkodierungen. Sie müssen die gleiche Kodierung wie die anderen "
+"Benutzer verwenden, damit deren Nachrichten korrekt angezeigt werden können."
 
-#: C/share-desktop.page:82(p)
+#: C/account-irc.page:135(item/p)
 msgid ""
-"For more information about how to use the remote desktop sharing application, "
-"refer to its help."
+"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
+"can handle text from most of the world's languages. Another common encoding "
+"for English and some other Western languages is ISO-8859-1."
 msgstr ""
-"Für weitere Informationen über die Benutzung der Anwendung zum Betrachten "
-"entfernter Arbeitsumgebungen ziehen Sie deren Hilfe zu Rate."
+"Als Vorgabe verwendet <app>Empathy</app> UTF-8, eine moderne "
+"Zeichenkodierung, die mit Texten aus den meisten Sprachen der Welt umgehen "
+"kann. Eine weitere häufig benutzte Kodierung für Englisch und andere "
+"westliche Sprachen ist ISO-8859-1."
 
-#: C/share-desktop.page:90(p)
+#: C/account-irc.page:141(item/title)
+msgid "<gui>Servers</gui>"
+msgstr "<gui>Server</gui>"
+
+#: C/account-irc.page:142(item/p)
 msgid ""
-"When you share your desktop with someone else, it is possible to experience "
-"system performance slowdown and low Internet speed."
+"An IRC network may have many servers you can connect to. When you are "
+"connected to a server on a particular network, you can communicate with all "
+"users on all other servers on that network. You can add and remove servers "
+"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
 msgstr ""
-"Wenn Sie Ihre Arbeitsumgebung für jemanden freigeben, kann das eine sinkende "
-"Systemleistung und eine langsamere Internetgeschwindigkeit zur Folge haben."
+"Ein IRC-Netzwerk kann aus vielen Servern bestehen, mit denen Sie sich "
+"verbinden können. Wenn Sie mit einem Server in einem bestimmten Netzwerk "
+"verbunden sind, dann können Sie auch mit den Benutzern auf anderen Servern "
+"dieses Netzwerks kommunizieren. Sie können mit Hilfe der Knöpfe "
+"<gui>Hinzufügen</gui> und <gui>Entfernen</gui> Server dieses Netzwerks "
+"hinzufügen und entfernen."
 
-#: C/share-desktop.page:96(p)
+#: C/account-irc.page:147(item/p)
 msgid ""
-"Some of your contacts may not be able to use this feature. It is necessary "
-"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
-"compatible remote desktop viewer application installed in their system."
+"When a server is selected, click the field under <gui>Server</gui> or "
+"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
+"to focus the field, and press the space bar to begin editing."
 msgstr ""
-"Beachten Sie, dass nicht alle Ihre Kontakte diese Funktionalität "
-"unterstützen. Sie benötigen dafür mindestens die Version 2.28 von "
-"<app>Empathy</app> sowie eine auf deren System installierte Anwendung zum "
-"Betrachten entfernter Arbeitsumgebungen."
+"Wenn ein Server ausgewählt ist, klicken Sie auf die Felder unter "
+"<gui>Server</gui> oder <gui>Port</gui>, um diese zu bearbeiten. Alternativ "
+"verwenden Sie die linke und rechte Pfeiltaste, um das Feld zu fokussieren. "
+"Mit der Leertaste beginnen Sie mit der Bearbeitung."
 
-#: C/set-custom-status.page:9(desc)
-msgid "Add, edit or delete personal messages for your status."
+#: C/account-irc.page:151(item/p)
+msgid ""
+"Select the check box in the <gui>SSL</gui> column to encrypt all "
+"communication with a server. Note that this does not prevent other users on "
+"the network from seeing what you write on public chat rooms."
 msgstr ""
-"Hinzufügen, Bearbeiten oder Löschen persönlicher Nachrichten für Ihren Status."
-
-#: C/set-custom-status.page:15(name)
-msgid "Jim Campbell"
-msgstr "Jim Campbell"
+"Aktivieren Sie das Ankreuzfeld in der <gui>SSL</gui>-Spalte, um jegliche "
+"Kommunikation mit dem Server zu verschlüsseln. Beachten Sie, dass dies "
+"andere Benutzer des Netzwerks nicht daran hindern wird, alles zu sehen, was "
+"Sie in öffentlichen Unterhaltungsräumen schreiben."
 
-#: C/set-custom-status.page:16(email)
-msgid "jwcampbell@gmail.com"
-msgstr "jwcampbell@gmail.com"
+#: C/account-jabber.page:7(info/desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Fortgeschrittene Optionen für Konten bei Jabber und Google Talk."
 
-#: C/set-custom-status.page:34(title)
-msgid "Set a custom message"
-msgstr "Festlegen einer benutzerdefinierten Nachricht"
+#: C/account-jabber.page:29(page/title)
+msgid "Jabber account details"
+msgstr "Jabber-Kontendetails"
 
-#: C/set-custom-status.page:36(p)
+#: C/account-jabber.page:31(page/p)
 msgid ""
-"Sometimes you may want to set a custom message for your status, for example "
-"to let people know that you will be unavailable for a certain period of time."
+"Most Jabber accounts will require only a login ID and a password to connect. "
+"For some accounts or on certain types of networks, you may need to enter "
+"additional information in the <gui>Advanced</gui> section. Normally, you "
+"will not need to use the advanced options below. For general instructions on "
+"adding an account, see <link xref=\"add-account\"/>."
 msgstr ""
-"Vielleicht wollen Sie eine benutzerdefinierte Nachricht für Ihren Status "
-"festlegen, zum Beispiel um jemanden darüber zu informieren, dass Sie für eine "
-"bestimmte Zeitspanne nicht verfügbar sein werden."
+"Die meisten Jabber-Konten erfordern nur eine Anmeldekennung und ein Passwort "
+"für die Verbindung. Für einige Konten oder bestimmte Netzwerktypen können "
+"Sie zusätzliche Informationen im Abschnitt <gui>Fortgeschritten</gui> "
+"eingeben. Normalerweise werden Sie die unten angegebenen zusätzlichen "
+"Optionen nicht benötigen. Allgemeine Informationen über das Hinzufügen eines "
+"Kontos finden Sie in <link xref=\"add-account\"/>."
 
-#: C/set-custom-status.page:40(p)
+#: C/account-jabber.page:39(note/p)
 msgid ""
-"It is possible to set a custom message based on the different statuses "
-"available."
+"Google Talk is a type of Jabber account. These instructions hold for Google "
+"Talk accounts as well."
 msgstr ""
-"Es ist möglich, eine benutzerdefinierte Nachricht festzulegen, basierend auf "
-"den verfügbaren Status."
+"Google Talk ist eine Art Jabber-Konto. Diese Anweisungen gelten daher auch "
+"für Google Talk."
 
-#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p)
-msgid ""
-"From the <gui>Contact List</gui> window, click on the drop-down list at the "
-"top."
-msgstr ""
-"Klicken Sie im<gui>Kontaktlisten</gui>-Fenster in die Auswahlliste oben."
+#: C/account-jabber.page:45(item/title)
+msgid "<gui>Encryption required (TLS/SSL)</gui>"
+msgstr "<gui>Verschlüsselung erforderlich (TLS/SSL)</gui>"
+
+#: C/account-jabber.page:46(item/title)
+msgid "<gui>Ignore SSL certificate errors</gui>"
+msgstr "<gui>SSL-Zertifikatfehler ignorieren</gui>"
 
-#: C/set-custom-status.page:52(p)
+#: C/account-jabber.page:47(item/p)
 msgid ""
-"Select the status you want to add a custom message to. You have to select the "
-"one identified with the label <gui>Custom Message</gui>."
+"Whenever possible, communication between <app>Empathy</app> and the Jabber "
+"server is encrypted. If encrypted communication is not possible, messages "
+"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
+"<app>Empathy</app> from communicating with the Jabber server when encryption "
+"is not possible."
 msgstr ""
-"Wählen Sie den Status aus, dem Sie eine benutzerdefinierte Nachricht zuordnen "
-"wollen. Sie müssen denjenigen mit der Bezeichnung <gui>Benutzerdefinierte "
-"Nachricht</gui> auswählen."
+"Wann immer es möglich ist, wird die Kommunikation zwischen <app>Empathy</"
+"app> und dem Jabber-Server verschlüsselt. Falls verschlüsselte Kommunikation "
+"nicht möglich ist, können Nachrichten unverschlüsselt gesendet werden. "
+"Wählen Sie <gui>Verschlüsselung erforderlich</gui>, um eine Kommunikation "
+"von <app>Empathy</app> mit dem Jabber-Server zu verhindern, wenn "
+"Verschlüsselung nicht möglich ist."
 
-#: C/set-custom-status.page:58(p)
+#: C/account-jabber.page:52(item/p)
 msgid ""
-"Enter your custom message in the text box at the top of the window, and press "
-"<key>Enter</key> to set the message."
+"Some Jabber servers may encrypt data using invalid certificates, or using "
+"certificates from unknown authorities. If you trust the server you are "
+"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
+"allow encrypted communication with invalid certificates."
 msgstr ""
-"Geben Sie Ihre benutzerdefinierte Nachricht in das Textfeld am oberen Rand "
-"des Fensters ein und drücken Sie die <key>Eingabetaste</key>, um sie zu "
-"speichern."
+"Einige Jabber-Server könnten Daten mit ungültigen Zertifikaten verschlüsseln "
+"oder Zertifikate von unbekannten Ausgabestellen verwenden. Falls Sie dem "
+"Server vertrauen, mit dem Sie sich verbinden wollen, wählen Sie <gui>SSL-"
+"Zertifikat-Fehler ignorieren</gui>, um verschlüsselte Kommunikation mit "
+"ungültigen Zertifikaten allgemein zuzulassen."
+
+#: C/account-jabber.page:59(item/title)
+msgid "<gui>Resource</gui>"
+msgstr "<gui>Ressource</gui>"
 
-#: C/set-custom-status.page:64(p)
+#: C/account-jabber.page:60(item/title)
+msgid "<gui>Priority</gui>"
+msgstr "<gui>Priorität</gui>"
+
+#: C/account-jabber.page:61(item/p)
 msgid ""
-"If you want to set the custom message as a favorite, saving it in order to "
-"use it again, click on the little star on the right of the text box where you "
-"wrote your custom message."
+"If you have multiple applications (for instance, on separate computers) "
+"connected to your account at the same time, you can set a resource to "
+"uniquely identify each one. By default, <app>Empathy</app> will use "
+"<input>Telepathy</input> as the resource."
 msgstr ""
-"Wenn Sie die benutzerdefinierte Nachricht als bevorzugt festlegen wollen, "
-"speichern Sie sie, um sie wiederverwenden zu können. Klicken Sie anschließend "
-"auf den kleinen Stern an der rechten Seite des Textfeldes, in welches Sie "
-"Ihre benutzerdefinierte Nachricht eingegeben haben."
+"Falls Sie über mehrere Anwendungen gleichzeitig mit Ihrem Konto verbunden "
+"sind, beispielsweise von verschiedenen Rechnern aus, können Sie eine "
+"Ressource zur eindeutigen Identifizierung jeder dieser Anmeldungen "
+"festlegen. Als Vorgabe verwendet <app>Empathy</app> als Ressource "
+"<input>Telepathy</input>."
 
-#: C/set-custom-status.page:69(p)
+#: C/account-jabber.page:65(item/p)
 msgid ""
-"If you do not do it, the custom message will not be available the next time "
-"you use <app>Empathy</app>. It will be saved only for the current session."
+"You can set the priority to specify which application should receive "
+"incoming messages from your contacts. New messages will be sent to the "
+"application with the highest priority."
 msgstr ""
-"Falls Sie es nicht tun, dann wird die benutzerdefinierte Nachricht bei der "
-"nächsten Benutzung von <app>Empathy</app> nicht verfügbar sein. Sie wird nur "
-"für die aktuelle Sitzung gespeichert."
+"Sie können die Priorität festlegen, um anzugeben, welche Anwendung die "
+"eingehenden Nachrichten von Ihren Kontakten annehmen soll. Neue Nachrichten "
+"werden dabei zu der Anwendung mit der höchsten Priorität gesendet."
 
-#: C/set-custom-status.page:78(title)
-msgid "Edit, remove and add a custom message"
+#: C/account-jabber.page:70(item/title)
+msgid "<gui>Override server settings</gui>"
+msgstr "<gui>Server-Einstellungen überschreiben</gui>"
+
+#: C/account-jabber.page:71(item/p)
+msgid ""
+"<app>Empathy</app> will use default settings to connect to the Jabber server "
+"based on your login ID. For some Jabber servers, you will need to enter "
+"custom server settings manually. These settings should be provided for you "
+"by your Jabber provider."
 msgstr ""
-"Bearbeiten, Entfernen und Hinzufügen einer benutzerdefinierten Nachricht"
+"<app>Empathy</app> verwendet Vorgabeeinstellungen für Verbindungen zum "
+"Jabber-Server, basierend auf Ihrer Anmeldekennung. Für einige Jabber-Server "
+"müssen Sie benutzerdefinierte Einstellungen manuell eingeben. Diese "
+"Einstellungen sollte Ihnen Ihr Jabber-Dienstanbieter zur Verfügung stellen."
 
-#: C/set-custom-status.page:88(p)
-msgid "Select <gui>Edit Custom Message</gui>."
-msgstr "Wählen Sie <gui>Benutzerdefinierte Nachrichten bearbeiten</gui>."
+#: C/accounts-window.page:11(info/desc)
+msgid "Add, modify, and delete accounts."
+msgstr "Hinzufügen, Bearbeiten und Entfernen von Konten."
 
-#: C/set-custom-status.page:95(p)
-msgid "To edit a custom message:"
-msgstr "So bearbeiten Sie eine benutzerdefinierte Nachricht:"
+#: C/accounts-window.page:33(page/title)
+msgid "Accounts Window"
+msgstr "Konten-Fenster"
 
-#: C/set-custom-status.page:100(p)
+#: C/accounts-window.page:35(page/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"edit and double-click on it."
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
 msgstr ""
-"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung aus, "
-"die Sie bearbeiten wollen, und klicken Sie zweimal darauf."
+"Das <gui>Konten</gui> ermöglicht Ihnen das Hinzufügen, Bearbeiten oder "
+"Entfernen von Kontakten."
 
-#: C/set-custom-status.page:106(p)
-msgid "Type the new custom message and press <key>Enter</key> to modify it."
+#: C/accounts-window.page:43(section/title)
+msgid "Account Details"
+msgstr "Kontendetails"
+
+#: C/accounts-window.page:44(section/p)
+msgid ""
+"For most types of accounts, you can simply enter a login ID and a password. "
+"Certain accounts or account types, however, may require additional "
+"information."
 msgstr ""
-"Geben Sie die neue benutzerdefinierte Nachricht ein und drücken Sie die "
-"<key>Eingabetaste</key>, um die Änderungen anzuwenden."
+"Für die meisten Kontentypen können Sie einfach eine Anmeldekennung und ein "
+"Passwort eingeben. Bestimmte Konten oder Kontentypen könnten allerdings "
+"weitere Informationen erfordern."
 
-#: C/set-custom-status.page:113(p)
-msgid "To remove a custom message:"
-msgstr "So entfernen Sie eine benutzerdefinierte Nachricht:"
+#: C/add-account.page:9(info/desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Einen neuen Kontakt zu <app>Empathy</app> hinzufügen."
+
+#: C/add-account.page:40(page/title)
+msgid "Add a new account"
+msgstr "Hinzufügen eines neuen Kontos"
 
-#: C/set-custom-status.page:118(p)
+#: C/add-account.page:42(page/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"remove."
+"You can add instant messaging accounts from any supported service to "
+"communicate with all of your contacts in <app>Empathy</app>. For some "
+"account providers, these steps will also allow you to register for a new "
+"account. For more details, see <link xref=\"create-account\"/>."
 msgstr ""
-"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung aus, "
-"die Sie entfernen wollen."
-
-#: C/set-custom-status.page:124(p)
-msgid "Click on the <gui>Remove</gui> button."
-msgstr "Klicken Sie auf den Knopf <gui>Entfernen</gui>."
+"Sie können Sofortnachrichten-Konten für jeden unterstützten Dienst anlegen, "
+"um mit allen Ihren Kontakten in <app>Empathy</app> zu kommunizieren. Für "
+"einige Dienstanbieter erlauben Ihnen diese Schritte auch die Registrierung "
+"eines neuen Kontos. Weitere Details hierzu finden Sie in <link xref=\"create-"
+"account\"/>."
 
-#: C/set-custom-status.page:131(p)
-msgid "To add a new custom message, from the <gui>Add New Preset</gui> section:"
+#: C/add-account.page:49(item/p) C/disable-account.page:49(item/p)
+#: C/irc-nick-password.page:50(item/p) C/remove-account.page:43(item/p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</gui> "
+"<gui>Accounts</gui></guiseq>, or press <key>F4</key>."
 msgstr ""
-"So fügen Sie im Abschnitt <gui>Neue Voreinstellung hinzufügen</gui> eine neue "
-"benutzerdefinierte Nachricht hinzu:"
+"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Bearbeiten</"
+"gui><gui>Konten</gui></guiseq> oder drücken Sie <key>F4</key>."
+
+#: C/add-account.page:53(item/p)
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "Klicken Sie auf <gui style=\"button\">+</gui>."
 
-#: C/set-custom-status.page:136(p)
+#: C/add-account.page:58(item/p)
 msgid ""
-"Click on the drop-down list to select the status you want to set a custom "
-"message to."
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
+"wish to add."
 msgstr ""
-"Klicken Sie auf die Auswahlliste, um den Status auszuwählen, dem Sie die "
-"benutzerdefinierte Nachricht zuordnen wollen."
+"Aus der <gui>Protokoll</gui>-Aufklappliste wählen Sie den Kontentyp, welchen "
+"Sie hinzufügen wollen."
 
-#: C/set-custom-status.page:142(p)
-msgid "Click on the text box, and type the new custom message."
+#: C/add-account.page:62(item/p)
+msgid ""
+"If you do not already have a registered account, select <gui>Create a new "
+"account on the server</gui>. This feature is not available for all account "
+"types, and may not work with some account providers. See <link xref=\"create-"
+"account\"/> for more information."
 msgstr ""
-"Klicken Sie in das Textfeld und geben Sie die neue benutzerdefinierte "
-"Nachricht ein."
+"Falls Sie noch kein Konto registriert haben, wählen Sie <gui>Ein neues Konto "
+"auf dem Server anlegen</gui>. Dieses Funktionsmerkmal ist nicht für alle "
+"Kontentypen verfügbar und funktioniert möglicherweise nicht mit allen "
+"Dienstanbietern. Weitere Informationen hierzu finden Sie in <link xref="
+"\"create-account\"/>."
 
-#: C/set-custom-status.page:147(p)
-msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+#: C/add-account.page:69(item/p)
+msgid ""
+"Enter the required information. For most accounts, you will only need a "
+"login ID and a password. Some accounts may require additional information. "
+"See <link xref=\"accounts-window#details\"/>for more information."
 msgstr ""
-"Klicken Sie auf <gui>Hinzufügen</gui>, um die neue Nachricht zu den "
-"voreingestellten Nachrichten hinzuzufügen."
+"Geben Sie die benötigten Informationen ein. Für die meisten Konten wird die "
+"Eingabe einer Anmeldekennung und eines Passworts genügen. Einige Konten "
+"könnten zusätzliche Angaben erfordern. Weitere Informationen hierzu finden "
+"Sie in <link xref=\"accounts-window#details\"/>."
 
-#: C/set-custom-status.page:156(p)
-msgid "When finished, click on <gui>Close</gui>."
-msgstr "Klicken Sie auf <gui>Schließen</gui>, sobald Sie fertig sind."
+#: C/add-account.page:74(item/p) C/import-account.page:61(item/p)
+#: C/irc-nick-password.page:63(item/p)
+msgid "Click <gui style=\"button\">Apply</gui>."
+msgstr "Klicken Sie auf <gui style=\"button\">Anwenden</gui>."
 
-#: C/set-custom-status.page:163(p)
+#: C/add-account.page:81(note/p)
 msgid ""
-"When you edit or add a new custom message, it will not be set as the current "
-"status message. You will need to select it from the <gui>Contact List</gui> "
-"window."
+"To change the name that identifies the account in the <gui>Accounts</gui> "
+"window, select the account from the list on the left and either click on the "
+"name or press the space bar. Edit the account name and press <key>Enter</"
+"key> when you’re finished."
 msgstr ""
-"Wenn Sie eine neue benutzerdefinierte Nachricht hinzufügen oder bearbeiten, "
-"wird diese nicht als aktuelle Statusnachricht festgelegt. Sie müssen Sie im "
-"<gui>Kontaktlisten</gui>-Fenster auswählen."
+"Um den Namen zu ändern, der das Konto im <gui>Konten</gui>-Fenster "
+"identifiziert, wählen Sie das Konto aus der linken Liste aus und klicken Sie "
+"anschließend entweder auf den Namen oder drücken Sie die <key>Leertaste</"
+"key>. Ändern Sie den Namen und drücken Sie die <key>Eingabetaste</key>, "
+"sobald Sie fertig sind."
 
-#: C/send-message.page:8(desc)
-msgid "Send a message to one of your contacts."
-msgstr "Eine Nachricht an einen Ihrer Kontakte senden."
+#: C/add-contact.page:9(info/desc)
+msgid "Add someone to the contact list."
+msgstr "Jemanden zur Kontaktliste hinzufügen."
 
-#: C/send-message.page:17(name) C/send-file.page:17(name)
-#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:14(name)
-#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:14(name)
-#: C/change-status.page:19(name) C/add-contact.page:18(name)
+#: C/add-contact.page:18(credit/name) C/change-status.page:24(credit/name)
+#: C/prob-conn-acctdisabled.page:15(credit/name)
+#: C/prob-conn-auth.page:17(credit/name)
+#: C/prob-conn-neterror.page:15(credit/name) C/prob-conn.page:14(credit/name)
+#: C/send-file.page:17(credit/name) C/send-message.page:17(credit/name)
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
-#: C/send-message.page:18(email) C/send-file.page:18(email)
-#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:15(email)
-#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:15(email)
-#: C/change-status.page:20(email) C/add-contact.page:19(email)
-msgid "philbull@gmail.com"
-msgstr "philbull@gmail.com"
+#: C/add-contact.page:33(page/title)
+msgid "Add someone to your list of contacts"
+msgstr "Jemanden zu Ihrer Kontaktliste hinzufügen"
 
-#: C/send-message.page:32(title)
-msgid "Send a message to someone"
-msgstr "Jemandem eine Nachricht senden"
+#: C/add-contact.page:37(item/p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr ""
+"Wählen Sie <guiseq><gui>Unterhaltung</gui><gui>Kontakt hinzufügen</gui></"
+"guiseq>."
 
-#: C/send-message.page:36(p)
+#: C/add-contact.page:40(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, double-click the name of the contact "
-"that you want to have a conversation with."
+"From the <gui>Account</gui> drop-down list, select the account you wish to "
+"use to connect to your contact. Your contact will need to be using the same "
+"service as the account you select."
 msgstr ""
-"Klicken Sie im Fenster <gui>Kontaktliste</gui> doppelt auf den Namen des "
-"Kontakts, mit dem Sie eine Unterhaltung beginnen wollen."
+"Wählen Sie in der <gui>Konten</gui>-Auswahlliste das Konto aus, mit dem Sie "
+"sich zu Ihrem Kontakt verbinden wollen. Es ist erforderlich, dass Ihr "
+"Kontakt den gleichen Dienst verwendet, den Sie hier angeben."
 
-#: C/send-message.page:42(p)
+#: C/add-contact.page:45(item/p)
 msgid ""
-"A new window will open. Type a message into the box at the bottom of the "
-"window and press <key>Enter</key> to send it."
+"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
+"screen name, or other appropriate identifier for the service type."
 msgstr ""
-"Ein neues Fenster wird geöffnet. Geben Sie eine Nachricht in das Feld am "
-"unteren Rand des Fensters ein und drücken Sie die <key>Eingabetaste</key>, um "
-"sie zu senden."
-
-#: C/send-message.page:50(title)
-msgid "Send a message to a meta-contact"
-msgstr "Einem Meta-Kontakt eine Nachricht senden"
+"Geben Sie im Feld <gui>Bezeichner</gui> die Anmeldekennung, den "
+"Benutzernamen, den angezeigten Namen oder andere entsprechende "
+"Identifizierungsmerkmale für den Diensttyp Ihre Kontakts ein."
 
-#: C/send-message.page:58(p)
+#: C/add-contact.page:49(item/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Chat</gui>."
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
+"to appear in your contact list."
 msgstr ""
-"Wählen Sie den Kontakt aus, mit dem Sie eine Unterhaltung beginnen wollen, "
-"und wählen Sie im Menü  <gui style=\"menuitem\">Unterhaltung</gui>."
+"Geben Sie in das <guilabel>Alias</guilabel>-Textfeld den Namen ein, so wie "
+"er in der Kontaktliste erscheinen soll."
 
-#: C/send-file.page:8(desc)
-msgid "Send a file from your computer to one of your contacts."
-msgstr "Senden Sie eine Datei von Ihrem Rechner an einen Ihrer Kontakte."
-
-#: C/send-file.page:36(title)
-msgid "Send files"
-msgstr "Dateien senden"
-
-#: C/send-file.page:40(p) C/favorite-rooms.page:66(p)
-msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+#: C/add-contact.page:53(item/p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
 msgstr ""
-"Führen Sie im <gui>Kontaktlisten</gui>-Fenster eine der folgenden Aktionen "
-"aus:"
+"Klicken Sie auf <gui>Hinzufügen</gui>, um die Person zu Ihrer Kontaktliste "
+"hinzuzufügen."
 
-#: C/send-file.page:45(p)
+#: C/add-contact.page:61(note/p)
 msgid ""
-"Right click on the contact you want to send a file to, and choose <gui>Send "
-"file</gui>."
+"To add a new person to your list of contacts, you need to be connected to "
+"the Internet and to your account."
 msgstr ""
-"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, dem Sie "
-"eine Datei senden wollen, und klicken Sie anschließend auf <gui>Datei senden</"
-"gui>."
+"Um eine neue Person zu Ihrer Kontaktliste hinzuzufügen, müssen Sie mit dem "
+"Internet und mit Ihrem Konto verbunden sein."
 
-#: C/send-file.page:50(p)
-msgid ""
-"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
-"gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
-msgstr ""
-"Klicken Sie auf den Kontakt, an den Sie eine Datei senden wollen, und wählen "
-"Sie <guiseq><gui>Bearbeiten</gui><gui>Kontakt</gui><gui>Datei senden</gui></"
-"guiseq>."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/audio-call.page:36(media) C/audio-video.page:70(media)
+#: C/video-call.page:39(media)
+msgctxt "_"
+msgid ""
+"external ref='figures/camera-web.png' md5='8166b4372f25b78cbf5a64fe2eac2ce5'"
+msgstr "original"
 
-#: C/send-file.page:58(p)
-msgid "Select the file to send, and click on <gui>Send</gui>."
-msgstr ""
-"Wählen Sie die zu sendende Datei aus und klicken Sie auf <gui>Senden</gui>."
+#: C/audio-call.page:9(info/desc)
+msgid "Call your contacts over the Internet."
+msgstr "Ihre Kontakte über das Internet anrufen."
 
-#: C/send-file.page:63(p)
-msgid "The <gui>File Transfers</gui> window will appear."
-msgstr "Das Fenster <gui>Dateiübertragungen</gui> wird geöffnet."
+#: C/audio-call.page:27(page/title)
+msgid "Start an audio conversation"
+msgstr "Eine Audio-Unterhaltung starten"
 
-#: C/send-file.page:66(p)
+#: C/audio-call.page:29(page/p)
 msgid ""
-"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
-"to halt the transfer."
+"You can call your contacts and have an audio conversation with them. This "
+"features only works with certain types of accounts, and it requires the "
+"other person to have an application that supports audio calls."
 msgstr ""
-"Warten Sie darauf, dass Ihr Kontakt die Dateiübertragung akzeptiert, oder "
-"klicken Sie auf <gui>Stopp</gui>, um die Ãœbertragung zu stoppen."
+"Sie können Ihre Kontakte anrufen und eine Audio-Unterhaltung mit ihnen "
+"führen. Dieses Funktionsmerkmal unterstützt verschiedene Kontentypen. "
+"Weiterhin ist es erforderlich, dass die anzurufende Person über eine "
+"Anwendung verfügt, die Audio-Anrufe unterstützt."
 
-#: C/send-file.page:72(p)
+#: C/audio-call.page:34(item/p)
 msgid ""
-"Once the transfer is finished, it is possible to close the <gui>File "
-"Transfers</gui> window."
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+"next to the name of the contact you wish to call and choose <gui style="
+"\"menuitem\">Audio Call</gui>."
 msgstr ""
-"Sobald die Dateiübertragung abgeschlossen ist, können Sie das Fenster "
-"<gui>Dateiübertragungen</gui> schließen."
+"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image"
+"\" mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-"
+"Symbol neben dem Namen des Kontakts, den Sie anrufen wollen, und wählen Sie "
+"<gui style=\"menuitem\">Videoanruf</gui>."
 
-#: C/send-file.page:80(p)
+#: C/audio-call.page:42(item/p) C/video-call.page:44(item/p)
 msgid ""
-"If you have multiple finished transfers listed in the window, click on "
-"<gui>Clear</gui> to empty the list. This will only remove the files from the "
-"list and will not delete them from your computer."
+"A new window will open. When the connection is established, you will see "
+"<gui>Connected</gui> at the bottom of the window, along with the total "
+"conversation time."
 msgstr ""
-"Falls mehrere abgeschlossene Dateiübertragungen in diesem Fenster aufgelistet "
-"sind, dann klicken Sie auf <gui>Leeren</gui>, um die Liste zu leeren. Dies "
-"entfernt die Dateien nur aus der Liste, aber nicht von Ihrem Rechner."
+"Ein neues Fenster wird geöffnet. Sobald die Verbindung aufgebaut wurde, "
+"sehen Sie am unteren Rand des Fensters <gui>Verbunden</gui> und die "
+"Gesamtzeit der Unterhaltung."
 
-#: C/send-file.page:87(p)
-msgid ""
-"It is possible to send files only using the following services: <em>Jabber</"
-"em>, <em>Google Talk</em> and <em>People Nearby</em>."
+#: C/audio-call.page:48(item/p) C/video-call.page:49(item/p)
+msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgstr ""
-"Mit folgenden Diensten können Sie Dateien versenden: <em>Jabber</em>, "
-"<em>Google Talk</em> und <em>People Nearby</em>."
+"Um eine Unterhaltung zu beenden, klicken Sie auf <gui style=\"button"
+"\">Auflegen</gui>."
 
-#: C/send-file.page:93(p)
+#: C/audio-call.page:55(note/p)
 msgid ""
-"In order to send a file to someone, you need to be connected to the Internet, "
-"or to a local area network."
+"To turn an audio conversation into a video conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui> <gui style=\"menuitem\">Video On</gui></guiseq>."
 msgstr ""
-"Um jemandem eine Datei senden zu können, müssen Sie mit dem Internet oder "
-"einem lokalen Netzwerk verbunden sein."
-
-#: C/salut-protocol.page:8(desc)
-msgid "Understanding the People Nearby feature."
-msgstr "Erläuterungen zum Funktionsmerkmal »Personen in der Nähe«."
+"Um eine Audio-Unterhaltung in eine Video-Unterhaltung umzuwandeln, wählen "
+"Sie <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video "
+"ein</gui></guiseq>."
 
-#: C/salut-protocol.page:33(title)
-msgid "What is People Nearby?"
-msgstr "Was ist »People Nearby«?"
+#: C/audio-call.page:63(section/title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Eine Unterhaltung mit einem Meta-Kontakt starten"
 
-#: C/salut-protocol.page:37(p)
-msgid "I'd like to see this played up a bit more."
-msgstr "I'd like to see this played up a bit more."
+#: C/audio-call.page:66(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:64(item/p)
+msgid ""
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr "Klicken Sie im<gui>Kontaktlisten</gui>-Fenster auf den Meta-Kontakt."
 
-#: C/salut-protocol.page:40(p)
+#: C/audio-call.page:71(item/p)
 msgid ""
-"The People Nearby service is a serverless communication service: you do not "
-"need to connect and authenticate to a central server in order to use it."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
 msgstr ""
-"Der Dienst »People Nearby« ist ein Kommunikationsdienst, der ohne Server "
-"auskommt: Es ist nicht notwendig, sich mit einem Server zu verbinden und sich "
-"zu legitimieren, um den Dienst zu nutzen."
+"Wählen Sie den Kontakt aus, mit dem Sie eine Unterhaltung beginnen wollen, "
+"und wählen Sie im Menü  <gui style=\"menuitem\">Audioanruf</gui>."
 
-#: C/salut-protocol.page:45(p)
+#: C/audio-call.page:78(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:76(note/p)
 msgid ""
-"This kind of serverless messaging system is restricted to a local area "
-"network and an active Internet connection is not necessary."
+"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
+"contact in the <gui>Contact List</gui> window, and stop over it for a "
+"second: a small pop-up message will appear showing the number of the "
+"contacts that form the meta-contact."
 msgstr ""
-"Dieses Nachrichtensystem ohne Server ist auf lokale Netzwerke beschränkt und "
-"erfordert keine aktive Internetverbindung."
+"Bewegen und halten Sie den Mauszeiger über einen Kontakt im Fenster "
+"<gui>Kontaktliste</gui>, um erkennen zu können, ob es sich um einen <em>Meta-"
+"Kontakt</em> handelt. Nach kurzer Zeit erscheint eine Einblendung, die die "
+"Anzahl der Einzelkontakte nennt."
 
-#: C/salut-protocol.page:49(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/audio-video.page:58(media)
+msgctxt "_"
 msgid ""
-"The people that use this service inside the same local area network will be "
-"auto-discovered, and it will be possible to send them messages and files as "
-"with other services."
+"external ref='figures/audio-input-microphone.png' "
+"md5='8d89026b66a263a3bc5b1f0665948567'"
+msgstr "original"
+
+#: C/audio-video.page:8(info/desc)
+msgid ""
+"Information on when it is possible to have an audio or video conversation."
 msgstr ""
-"Teilnehmer dieses Dienstes innerhalb des gleichen lokalen Netzwerks werden "
-"automatisch ermittelt. Es ist möglich, ihnen Nachrichten und Dateien zu "
-"senden, wie mit anderen Diensten auch."
+"Informationen über die Möglichkeiten für Audio- und Video-Unterhaltungen."
 
-#: C/salut-protocol.page:54(p)
+#: C/audio-video.page:32(page/title)
+msgid "Audio and video support"
+msgstr "Audio- und Video-Unterstützung"
+
+#: C/audio-video.page:34(page/p)
 msgid ""
-"All the modern local area networks should be able to support this kind of "
-"service."
+"You can only have audio and video conversation with contacts who are using "
+"an application which also supports this feature. When your contacts support "
+"audio or video conversations, you will see the following icons next to their "
+"names in the contact list:"
 msgstr ""
-"Alle modernen lokalen Netzwerke sollten in der Lage sein, diese Art Dienst zu "
-"unterstützen."
+"Sie können Audio- und Video-Unterhaltungen nur mit Kontakten führen, die "
+"ebenfalls eine Anwendung benutzen, die dieses Funktionsmerkmal unterstützt. "
+"Wenn Ihre Kontakte Audio- oder Video-Unterhaltungen unterstützen, werden "
+"neben deren Namen in der Kontaktliste folgende Symbole angezeigt:"
 
-#: C/remove-account.page:8(desc)
-msgid "Completely remove an account from <app>Empathy</app>."
-msgstr "Ein Konto vollständig aus <app>Empathy</app> löschen."
+#: C/audio-video.page:43(td/p)
+msgid "Icon"
+msgstr "Symbol"
 
-#: C/remove-account.page:33(title)
-msgid "Remove an account"
-msgstr "Löschen eines Kontos"
+#: C/audio-video.page:48(td/p)
+msgid "Description"
+msgstr "Beschreibung"
 
-#: C/remove-account.page:35(p)
+#: C/audio-video.page:57(td/p)
 msgid ""
-"You can completely remove an account from <app>Empathy</app> if you no longer "
-"wish to use the account. If you wish to use the account in <app>Empathy</app> "
-"again in the future, you will have to add your account details again."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-"
+"microphone.png\"> Icon for audio conversation </media>"
 msgstr ""
-"Sie können ein Konto aus <app>Empathy</app> vollständig löschen, falls Sie "
-"dieses nicht mehr benutzen wollen. Sollten Sie in Zukunft dieses Konto in "
-"<app>Empathy</app> erneut nutzen wollen, dann müssen Sie die Kontendetails "
-"erneut eingeben."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-"
+"microphone.png\">Symbol für Sprachunterhaltungen</media>"
 
-#: C/remove-account.page:42(p) C/irc-nick-password.page:50(p)
-#: C/disable-account.page:48(p) C/add-account.page:48(p)
+#: C/audio-video.page:64(td/p)
+msgid "The contact is able to have an audio conversation."
+msgstr "Der Kontakt kann eine Audio-Unterhaltung führen."
+
+#: C/audio-video.page:69(td/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
-"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> "
+"Icon for video conversation </media>"
 msgstr ""
-"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Bearbeiten</"
-"gui><gui>Konten</gui></guiseq> oder drücken Sie <key>F4</key>."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png"
+"\">Symbol für Video-Unterhaltungen</media>"
 
-#: C/remove-account.page:46(p)
+#: C/audio-video.page:76(td/p)
+msgid "The contact is able to have a video conversation."
+msgstr "Der Kontakt kann eine Video-Unterhaltung führen."
+
+#: C/audio-video.page:83(note/p)
 msgid ""
-"Select the account you wish to remove from the accounts list on the left side "
-"of the window."
+"In order to have an audio conversation, you need to have a sound card that "
+"is supported by your operating system, and a working microphone."
 msgstr ""
-"Wählen Sie das Konto, das Sie aus der Kontenliste entfernen wollen, an der "
-"linken Seite des Fensters aus."
-
-#: C/remove-account.page:50(p)
-msgid "Click on <gui style=\"button\">Remove</gui>."
-msgstr "Klicken Sie auf <gui style=\"button\">Entfernen</gui>."
+"Um eine Audio-Unterhaltung führen zu können, benötigen Sie eine von Ihrem "
+"Betriebssystem unterstützte Soundkarte sowie ein funktionierendes Mikrofon."
 
-#: C/remove-account.page:53(p)
+#: C/audio-video.page:87(note/p)
 msgid ""
-"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
-"button to permanently remove the account."
+"In order to have a video conversation, you need to have a webcam that is "
+"supported by your operating system, and a working microphone."
 msgstr ""
-"Ein Dialogfenster bittet darum, den Vorgang zu bestätigen. Klicken Sie auf "
-"den Knopf <gui>Entfernen</gui>, um das Konto dauerhaft zu entfernen."
+"Um eine Video-Unterhaltung führen zu können, benötigen Sie eine von Ihrem "
+"Betriebssystem unterstützte Webcam sowie ein funktionierendes Mikrofon."
 
-#: C/remove-account.page:59(p)
+#: C/audio-video.page:95(section/title)
+msgid "Supported Account Types"
+msgstr "Unterstützte Kontentypen"
+
+#: C/audio-video.page:97(section/p)
 msgid ""
-"Even after removing an account, <app>Empathy</app> does not delete your "
-"conversation history for that account."
+"You can only have audio and video conversations using accounts on certain "
+"supported services. The following table lists whether audio and video is "
+"supported for each type of account."
 msgstr ""
-"Auch nach dem Entfernen des Kontos löscht <app>Empathy</app> nicht die zu "
-"diesem Konto gehörenden Unterhaltungsmitschnitte."
+"Sie können nur mit denjenigen Konten Audio- oder Video-Unterhaltungen "
+"führen, welche die entsprechenden Dienste unterstützen. In der folgenden "
+"Tabelle wird für jeden Kontentyp aufgelistet, ob Audio und Video unterstützt "
+"werden."
 
-#: C/prob-conn.page:7(desc)
-msgid "Diagnose common problems connecting to an instant messaging service."
+#: C/audio-video.page:102(note/p)
+msgid ""
+"Account types are provided by plugins. Your system may not have all of the "
+"following types available, or it may have types not listed here. Updated "
+"plugins may make audio or video conversations possible on account types that "
+"are listed as unsupported here."
 msgstr ""
-"Diagnostizieren häufiger Verbindungsprobleme mit einem "
-"Sofortnachrichtendienst."
+"Kontentypen werden durch Plugins bereitgestellt. Auf Ihrem System könnten "
+"nicht alle der folgenden Typen verfügbar sein, oder die bei Ihnen "
+"verfügbaren Typen sind hier nicht aufgelistet. Durch aktualisierte Plugins "
+"könnte es möglich sein, dass hier als nicht unterstützte Typen aufgelistete "
+"Konten dennoch Audio- und Video-Unterhaltungen ermöglichen."
 
-#: C/prob-conn.page:29(title)
-msgid "Problems connecting to an instant messaging service"
-msgstr "Probleme beim Verbinden zu einem Sofortnachrichtendienst"
+#: C/audio-video.page:128(td/p)
+msgid "Service"
+msgstr "Dienst"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/prob-conn-neterror.page:58(None) C/prob-conn-name.page:43(None)
-#: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None)
-msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
-msgstr "original"
+#: C/audio-video.page:129(td/p)
+msgid "Audio"
+msgstr "Audio"
 
-#: C/prob-conn-neterror.page:7(desc)
-msgid ""
-"An error message which says “<gui>Network error</gui>� appears in the main "
-"window."
-msgstr ""
-"Eine Fehlermeldung mit dem Text »<gui>Netzwerkfehler</gui>« erscheint im "
-"Hauptfenster."
+#: C/audio-video.page:130(td/p)
+msgid "Video"
+msgstr "Video"
 
-#: C/prob-conn-neterror.page:33(title)
-msgid "I get a message that says “Network error�"
-msgstr "Eine Meldung zeigt einen »Netzwerkfehler« an"
+#: C/audio-video.page:135(td/p)
+msgid "AIM"
+msgstr "AIM"
 
-#: C/prob-conn-neterror.page:36(cite)
-msgid "shaunm"
-msgstr "shaunm"
+#: C/audio-video.page:136(td/p) C/audio-video.page:137(td/p)
+#: C/audio-video.page:141(td/p) C/audio-video.page:142(td/p)
+#: C/audio-video.page:146(td/p) C/audio-video.page:147(td/p)
+#: C/audio-video.page:156(td/p) C/audio-video.page:157(td/p)
+#: C/audio-video.page:161(td/p) C/audio-video.page:162(td/p)
+#: C/audio-video.page:166(td/p) C/audio-video.page:167(td/p)
+#: C/audio-video.page:181(td/p) C/audio-video.page:182(td/p)
+#: C/audio-video.page:186(td/p) C/audio-video.page:187(td/p)
+#: C/audio-video.page:191(td/p) C/audio-video.page:192(td/p)
+#: C/audio-video.page:196(td/p) C/audio-video.page:197(td/p)
+#: C/audio-video.page:201(td/p) C/audio-video.page:202(td/p)
+#: C/audio-video.page:211(td/p) C/audio-video.page:212(td/p)
+#: C/audio-video.page:216(td/p) C/audio-video.page:217(td/p)
+msgid "No"
+msgstr "Nein"
 
-# Blöd, dass diese Kommentare auch noch in der pot-Datei erscheinen. Mallard ist eben noch lange nicht da, wo es sein sollte.
-#: C/prob-conn-neterror.page:37(p)
-msgid ""
-"Empathy no longer allows you to create an IRC account without a valid nick. "
-"I've removed the guide link. Remove the text."
-msgstr ""
-"<app>Empathy</app> erlaubt es nicht mehr, ein IRC-Konto ohne einen gültigen "
-"Spitznamen anzulegen"
+#: C/audio-video.page:140(td/p)
+msgid "Facebook Chat"
+msgstr "Facebook-Unterhaltung"
 
-#: C/prob-conn-neterror.page:41(p)
-msgid ""
-"This kind of error happens when <app>Empathy</app> cannot communicate with "
-"the instant messaging service for some reason."
-msgstr ""
-"Dieser Fehler tritt auf, wenn <app>Empathy</app> aus irgendeinem Grund nicht "
-"in der Lage ist, mit dem Sofortnachrichtendienst zu kommunizieren."
+#: C/audio-video.page:145(td/p)
+msgid "gadugadu"
+msgstr "gadugadu"
 
-#: C/prob-conn-neterror.page:45(p)
-msgid ""
-"Also, this kind of error happens when you try to use an IRC account without "
-"setting a nickname."
-msgstr ""
-"Dieser Fehler tritt auch auf, wenn Sie ein IRC-Konto verwenden wollen, ohne "
-"einen Spitznamen festzulegen."
+#: C/audio-video.page:150(td/p)
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p)
-#: C/prob-conn-acctdisabled.page:43(p)
-msgid ""
-"Make sure that you are connected to the Internet, or to a local area network."
-msgstr ""
-"Stellen Sie sicher, dass Sie mit dem Internet beziehungsweise mit einem "
-"lokalen Netzwerk verbunden sind."
+#: C/audio-video.page:151(td/p) C/audio-video.page:152(td/p)
+#: C/audio-video.page:171(td/p) C/audio-video.page:172(td/p)
+#: C/audio-video.page:176(td/p) C/audio-video.page:177(td/p)
+#: C/audio-video.page:206(td/p) C/audio-video.page:207(td/p)
+msgid "Yes"
+msgstr "Ja"
 
-#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
-#: C/prob-conn-auth.page:57(p)
-msgid ""
-"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
-"\">edit</media> icon in the error message."
-msgstr ""
-"Klicken Sie auf das <media type=\"image\" mime=\"image/png\" src=\"figures/"
-"gtk-edit.png\">Bearbeiten</media>-Symbol in der Fehlermeldung."
+#: C/audio-video.page:155(td/p)
+msgid "Groupwise"
+msgstr "Groupwise"
 
-#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p)
-msgid ""
-"Check in the <gui>Advanced</gui> section that all the details are correct. "
-"You should be able to find these details from the website of the messaging "
-"service."
-msgstr ""
-"Überprüfen Sie im Abschnitt <gui>Fortgeschritten</gui>, dass alle Details "
-"korrekt sind. Es sollte möglich sein, diese Details auf der Webseite des "
-"jeweiligen Sofortnachrichtendienstes zu finden."
+#: C/audio-video.page:160(td/p)
+msgid "ICQ"
+msgstr "ICQ"
 
-#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p)
-msgid ""
-"Deselect the <gui>Enabled</gui>, and then select it again to try to reconnect "
-"to the service."
-msgstr ""
-"Deaktivieren Sie das Ankreuzfeld <gui>Aktiviert</gui> und aktivieren Sie es "
-"erneut, um einen neuen Verbindungsversuch zu starten."
+#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+msgid "IRC"
+msgstr "IRC"
 
-#: C/prob-conn-neterror.page:90(title)
-msgid "Proxy support"
-msgstr "Proxy-Unterstützung"
+#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title)
+msgid "Jabber"
+msgstr "Jabber"
 
-#: C/prob-conn-neterror.page:91(p)
-msgid ""
-"At the moment <app>Empathy</app> can not be configured to work with a proxy."
-msgstr ""
-"Momentan ist es nicht möglich, <app>Empathy</app> so zu konfigurieren, dass "
-"es mit einem Proxy-Server zusammenarbeitet."
+#: C/audio-video.page:175(td/p)
+msgid "MSN"
+msgstr "MSN"
 
-#: C/prob-conn-name.page:9(title)
-msgid "“Name in use�"
-msgstr "»Name bereits in Benutzung«"
+#: C/audio-video.page:180(td/p)
+msgid "myspace"
+msgstr "myspace"
 
-#: C/prob-conn-name.page:10(desc)
-msgid ""
-"An error message which says “<gui>Name in use</gui>� appears in the main "
-"window."
-msgstr ""
-"Eine Fehlermeldung »<gui>Name bereits in Benutzung</gui>« erscheint im "
-"Hauptfenster."
+#: C/audio-video.page:185(td/p)
+msgid "qq"
+msgstr "qq"
 
-#: C/prob-conn-name.page:32(title)
-msgid "I get a message that says “Name in use�"
-msgstr "Eine Meldung zeigt »Name bereits in Benutzung« an"
+#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+msgid "People Nearby"
+msgstr "Personen in der Nähe"
 
-#: C/prob-conn-name.page:34(p)
-msgid ""
-"This kind of error happens when you try to connect to your IRC account and "
-"you are using a nickname that is already being used by someone else on that "
-"particular network."
-msgstr ""
-"Dieser Fehler tritt auf, wenn Sie sich mit Ihrem IRC-Konto verbinden wollen "
-"und Sie einen Spitznamen verwenden wollen, den in diesem bestimmten Netzwerk "
-"bereits jemand anders gewählt hat."
+#: C/audio-video.page:195(td/p)
+msgid "sametime"
+msgstr "gleichzeitig"
 
-#: C/prob-conn-name.page:50(p)
-msgid "In the <gui>Nickname</gui> text box, type a new nickname."
-msgstr ""
-"Geben Sie in das <guilabel>Spitzname</guilabel>-Textfeld einen neuen "
-"Spitznamen ein."
+#: C/audio-video.page:200(td/p)
+msgid "silc"
+msgstr "silc"
 
-#: C/prob-conn-name.page:55(p)
-msgid ""
-"If you have registered that nickname within the network you are using, set "
-"the password for that nickname. For more information, see <link xref=\"irc-"
-"nick-password\"/>."
+#: C/audio-video.page:205(td/p) C/create-account.page:89(section/title)
+msgid "SIP"
+msgstr "SIP"
+
+#: C/audio-video.page:210(td/p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: C/audio-video.page:215(td/p)
+msgid "zephyr"
+msgstr "zephyr"
+
+#: C/change-status.page:9(info/desc)
+msgid "Change your status to advertise your availability to your contacts."
 msgstr ""
-"Falls Sie diesen Spitznamen in dem von Ihnen verwendeten Netzwerk registriert "
-"haben, legen Sie für diesen Spitznamen ein Passwort fest. Weitere "
-"Informationen hierzu finden Sie in <link xref=\"irc-nick-password\"/>."
+"Ändern des Status, um Ihre Kontakte über Ihre Verfügbarkeit zu informieren."
 
-#: C/prob-conn-name.page:64(p)
+#: C/change-status.page:39(page/title)
+msgid "Change your status"
+msgstr "Ändern Ihres Status"
+
+#: C/change-status.page:41(page/p)
 msgid ""
-"Deselect the <gui>Enabled</gui> check-box next to the name of your account, "
-"and then select it again to try to reconnect to the service."
+"You can set your status to indicate your availability to your contacts. "
+"<app>Empathy</app> allows you to select from a list of defined statuses."
 msgstr ""
-"Deaktivieren Sie das Ankreuzfeld <gui>Aktiviert</gui> neben dem Namen Ihres "
-"Kontos und aktivieren Sie es erneut, um einen neuen Verbindungsversuch zu "
-"starten."
+"Sie können Ihren Status festlegen, um Ihre Verfügbarkeit Ihren Kontakten "
+"anzuzeigen. <app>Empathy</app> ermöglicht Ihnen, aus einer Liste "
+"vordefinierter Status zu wählen."
 
-#: C/prob-conn-auth.page:8(desc)
+#: C/change-status.page:46(item/p)
 msgid ""
-"An error message which says “<gui>Authentication failed</gui>� appears in the "
-"main window."
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
 msgstr ""
-"Eine Fehlermeldung »<gui>Legitimierung fehlgeschlagen</gui>« erscheint im "
-"Hauptfenster."
+"Klicken Sie auf die Auswahlliste oben im <gui>Kontaktlisten</gui>-Fenster."
 
-#: C/prob-conn-auth.page:36(title)
-msgid "I get a message that says “Authentication failed�"
-msgstr "Eine Meldung zeigt »Legitimierung fehlgeschlagen« an"
+#: C/change-status.page:51(item/p)
+msgid "Select a status from the list."
+msgstr "Wählen Sie einen Status in der Liste aus."
 
-#: C/prob-conn-auth.page:38(p)
+#: C/change-status.page:57(page/p)
 msgid ""
-"This kind of error happens when your instant messaging service is not "
-"allowing you to connect because it does not recognize your username or "
-"password for some reason."
+"See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
+"what they mean. You can also <link xref=\"set-custom-status\">add custom "
+"status messages</link> to provide more information about your availability "
+"to your contacts."
 msgstr ""
-"Dieser Fehler geschieht, wenn Ihr Sofortnachrichtendienst keine Verbindung "
-"erlaubt, weil Benutzername oder Passwort aus verschiedenen Gründen nicht "
-"akzeptiert werden konnten."
+"In <link xref=\"status-icons\"/> finden Sie eine Liste mitgelieferter Status "
+"sowie deren Bedeutung. Sie können auch <link xref=\"set-custom-status"
+"\">benutzerdefinierte Statusmeldungen hinzufügen</link>, um für Ihre "
+"Kontakte weitere Informationen über Ihren Status bereitzustellen."
 
-#: C/prob-conn-auth.page:50(p)
+#: C/change-status.page:63(note/p)
 msgid ""
-"Make sure that you have registered an account with the service you are trying "
-"to connect to. If you do not have an account, most services will not allow "
-"you to connect."
+"If you do not use your computer for a while, or if the screensaver is on, "
+"the status will be automatically set to Away."
 msgstr ""
-"Stellen Sie sicher, dass Sie bei dem Dienst ein Konto registriert haben, mit "
-"dem Sie sich verbinden wollen. Falls Sie über kein Konto verfügen, verweigern "
-"die meisten Dienste die Verbindung."
+"Falls Sie Ihren Rechner für eine gewisse Zeit nicht bedienen oder der "
+"Bildschirmschoner eingeschaltet ist, wird der Status automatisch auf "
+"abwesend gesetzt."
+
+#: C/create-account.page:9(info/desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "Ein Konto bei einem der unterstützten Nachrichtendienste registrieren."
 
-#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p)
+#: C/create-account.page:34(page/title)
+msgid "Register for a new account"
+msgstr "Ein neues Konto registrieren"
+
+#: C/create-account.page:36(page/p)
 msgid ""
-"Type your username and password again to make sure that they are correct."
+"Most account types require you to create an account with a account provider "
+"before you can connect using instant messaging applications like "
+"<app>Empathy</app>. With some account providers, you can use <app>Empathy</"
+"app> to register for a new account, using the same steps as you would to "
+"<link xref=\"add-account\">add an account</link>."
 msgstr ""
-"Geben sie Ihren Benutzernamen und Ihr Passwort erneut ein, um sicher zu "
-"stellen, dass diese korrekt sind."
+"Für die meisten Kontentypen ist es erforderlich, dass Sie ein Konto bei "
+"einem Dienstanbieter erstellen, bevor Sie sich über Sofortnachrichten-"
+"Anwendungen wie <gui>Empathy</gui> verbinden können. Für einige "
+"Kontenanbieter können Sie <gui>Empathy</gui> verwenden, um ein neues Konto "
+"zu registrieren, unter Anwendung der gleichen Schritte wie für das <link "
+"xref=\"add-account\">Hinzufügen eines Kontos</link>."
 
-#: C/prob-conn-acctdisabled.page:7(desc)
+#: C/create-account.page:42(page/p)
 msgid ""
-"The instant messaging account that you want to use is not enabled in the list "
-"of accounts."
+"This page provides information on creating a new account for various types "
+"of accounts. Your account provider should give you a login ID and a "
+"password, as well as any additional information you need to connect using "
+"<app>Empathy</app>."
 msgstr ""
-"Das Sofortnachrichten-Konto, welches Sie verwenden wollen, ist in der "
-"Kontenliste nicht aktiviert."
+"Diese Seite stellt für die verschiedenen Kontentypen Informationen über das "
+"Anlegen eines neuen Kontos bereit. Sie sollten von Ihrem Dienstanbieter eine "
+"Anmeldekennung und ein Passwort sowie eventuelle zusätzliche Informationen "
+"erhalten haben, die Sie zum Verbinden mit <gui>Empathy</gui> benötigen."
 
-#: C/prob-conn-acctdisabled.page:33(title)
-msgid "My account is not enabled"
-msgstr "Mein Konto ist nicht aktiviert"
+#: C/create-account.page:47(section/title)
+msgid "Facebook"
+msgstr "Facebook"
 
-#: C/prob-conn-acctdisabled.page:35(p)
+#: C/create-account.page:48(section/p)
 msgid ""
-"If the instant messaging account that you want to use is not enabled in the "
-"drop-down account list when you try to start a new conversation or join a "
-"room, your account details may not be correct."
+"Facebook is one of the most-used social networks. It allows users to create "
+"their own profile and to communicate with their friends."
 msgstr ""
-"Falls das zu verwendende Sofortnachrichten-Konto in der Auswahlliste nicht "
-"aktiviert ist, wenn Sie eine neue Unterhaltung starten oder einen Raum "
-"betreten wollen, könnten Ihre Kontendetails eventuell nicht korrekt sein."
+"Facebook ist eines der am meisten genutzten sozialen Netzwerke. Den "
+"Benutzern wird die Erstellung eines eigenen Profils und die Kommunikation "
+"mit ihren Freunden ermöglicht."
 
-#: C/prob-conn-acctdisabled.page:48(p)
+#: C/create-account.page:52(section/p)
 msgid ""
-"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
-"account that is not working."
+"To use Facebook to communicate with your friends, you will need to create a "
+"new account from the website: <link href=\"http://www.facebook.com\">www."
+"facebook.com</link>."
 msgstr ""
-"Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Konten</gui></guiseq> und wählen "
-"Sie den nicht funktionierenden Kontakt aus."
+"Um Facebook zur Unterhaltung mit Ihren Freunden nutzen zu können, müssen Sie "
+"ein neues Konto auf folgender Webseite erstellen: <link href=\"http://www."
+"facebook.com\">www.facebook.com</link>."
 
-#: C/prob-conn-acctdisabled.page:65(p)
+#: C/create-account.page:62(section/p)
 msgid ""
-"Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. "
-"If it is not, select the check-box to enable the account."
+"Jabber is an open instant messaging system. Like email, Jabber allows you to "
+"choose your account provider and communicate with all other Jabber users, "
+"regardless of their account provider."
 msgstr ""
-"Stellen Sie sicher, dass das Ankreuzfeld <gui style=\"checkbox\">Aktiviert</"
-"gui> neben dem Namen Ihres Kontos ausgewählt ist. Falls nicht, aktivieren Sie "
-"das Ankreuzfeld, um das Konto zu aktivieren."
-
-#: C/prev-conv.page:8(desc)
-msgid "Browse or search your previous conversations."
-msgstr "Betrachten und Durchsuchen Ihrer früheren Unterhaltungen."
-
-#: C/prev-conv.page:35(title)
-msgid "View previous conversations"
-msgstr "Vorherige Unterhaltungen anschauen"
+"Jabber ist ein offenes Sofortnachrichtensystem. Wie E-Mail, erlaubt Jabber "
+"die Wahl Ihres Konto-Dienstanbieters und die Kommunikation mit anderen "
+"Jabber-Benutzern, unabhängig von deren Konto-Dienstanbietern."
 
-#: C/prev-conv.page:39(p)
+#: C/create-account.page:66(section/p)
 msgid ""
-"Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug."
-"cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, "
-"independent of the selection (like in yellow or something), we can use the "
-"term \"highlight\". Otherwise we need to use the term \"select\". Watch that "
-"bug."
+"You will need to create a new account with a Jabber provider. There are many "
+"free providers; one popular provider is <link href=\"http://register.jabber."
+"org/\">Jabber.org</link>."
 msgstr ""
-"Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug."
-"cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, "
-"independent of the selection (like in yellow or something), we can use the "
-"term \"highlight\". Otherwise we need to use the term \"select\". Watch that "
-"bug."
+"Es wird nötig sein, dass Sie ein neues Konto bei einem Jabber-Dienstanbieter "
+"anlegen. Es gibt zahlreiche freie Jabber-Dienstanbieter, einer der "
+"populärsten ist <link href=\"http://register.jabber.org/\">Jabber.org</link>."
 
-#: C/prev-conv.page:46(p)
+#: C/create-account.page:71(note/p)
 msgid ""
-"<app>Empathy</app> automatically saves all your text conversations you have "
-"with your contacts. You can <link xref=\"#search\">search through all of your "
-"previous conversations</link> or <link xref=\"#browse\">browse previous "
-"conversations</link> by contact and date."
+"If you use Google Mail or Google Talk, you already have a Jabber account. "
+"Google Talk is a Jabber service. Simply use your Google Mail address and "
+"password in <app>Empathy</app> to connect."
 msgstr ""
-"<app>Empathy</app> speichert automatisch alle Ihre Text-Unterhaltungen, die "
-"Sie mit Ihren Kontakten führen. Sie können <link xref=\"#search\">alle "
-"früheren Unterhaltungen durchsuchen</link> oder <link xref=\"#browse"
-"\">frühere Unterhaltungen anhand Kontakt und Datum suchen</link>."
+"Falls Sie Google Mail oder Google Talk benutzen, haben Sie bereits ein "
+"Jabber-Konto. Google Talk ist ein Jabber-Dienst. Verwenden Sie einfach Ihre "
+"Google Mail-Adresse und Ihr Passwort in <app>Empathy</app> für die "
+"Verbindung."
 
-#: C/prev-conv.page:54(p)
+#: C/create-account.page:80(section/p)
 msgid ""
-"You do not need to be connected to the Internet to view and search your "
-"previous conversations."
+"You do not need to create an account with a service provider to use this "
+"feature. This service works whenever you are connected to a local network, "
+"such as a wireless hotspot. It automatically finds all other users on the "
+"network who are also using this service."
 msgstr ""
-"Sie müssen nicht mit dem Internet verbunden sein, um Ihre vorherigen "
-"Unterhaltungen zu betrachten und zu durchsuchen."
+"Sie müssen kein Konto bei einem Dienstanbieter anlegen, um dieses "
+"Funktionsmerkmal nutzen zu können. Dieser Dienst ist immer dann verfügbar, "
+"wenn Sie mit einem lokalen Netzwerk verbunden sind, zum Beispiel einem "
+"drahtlosen Zugangspunkt (Hotspot). Andere Benutzer, die diesen Dienst "
+"nutzen, werden im Netzwerk automatisch gefunden."
 
-#: C/prev-conv.page:61(title)
-msgid "Search previous conversations"
-msgstr "Vorherige Unterhaltungen durchsuchen"
+#: C/create-account.page:85(section/p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr "Weitere Informationen finden Sie in <link xref=\"salut-protocol\"/>."
 
-#: C/prev-conv.page:63(p)
+#: C/create-account.page:91(section/p)
 msgid ""
-"You can perform a full-text search through all of your previous conversations."
+"SIP is an open system which allows users to have audio and video "
+"conversations over the Internet. You need to create an account with a SIP "
+"provider. You can communicate with all other SIP users, regardless of which "
+"SIP provider they use."
 msgstr ""
-"Sie können den Volltext aller Ihrer vorherigen Unterhaltungen durchsuchen."
+"SIP ist ein offenes System für Audio- und Video-Unterhaltungen übar das "
+"Internet. Sie müssen ein SIP-Konto bei einem Dienstanbieter erstellen. "
+"Unabhängig davon, welchen Dienstanbieter Ihre Kontakte nutzen, können Sie "
+"mit allen anderen SIP-Benutzern kommunizieren."
 
-#: C/prev-conv.page:67(p) C/prev-conv.page:96(p)
+#: C/create-account.page:97(note/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</"
-"key>."
+"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
+"index.php?page=register\">Ekiga.net</link> service does not currently work "
+"with <app>Empathy</app>."
 msgstr ""
-"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Ansicht</"
-"gui><gui>Vorherige Unterhaltungen</gui></guiseq>. Alternativ drücken Sie "
-"<key>F3</key>."
-
-#: C/prev-conv.page:71(p)
-msgid "Select the <gui>Search</gui> tab."
-msgstr "Wählen Sie den Reiter <gui>Suchen</gui>."
+"Wegen technischer Unterschiede funktioniert <link href=\"https://www.ekiga."
+"net/index.php?page=register\">Ekiga.net</link> derzeit nicht mit "
+"<app>Empathy</app>."
 
-#: C/prev-conv.page:74(p)
+#: C/create-account.page:102(section/p)
 msgid ""
-"In the <gui>For</gui> field, type the text you want to search for. Click "
-"<gui>Find</gui> or press <key>Enter</key>."
+"Some SIP providers allow you to call normal phones from your computer. "
+"Generally, you will need to subscribe to a paid service for this feature."
 msgstr ""
-"Geben Sie in das <gui>Nach</gui>-Textfeld den Text ein, nach dem Sie suchen "
-"wollen. Klicken Sie auf <gui>Suchen</gui> oder drücken Sie die "
-"<key>Eingabetaste</key>."
+"Einige SIP-Dienste ermöglichen es, von Ihrem Rechner aus gewöhnliche "
+"Telefone anzurufen. Im Allgemeinen werden Sie sich hierfür an einem zu "
+"bezahlenden Dienst registrieren müssen."
 
-#: C/prev-conv.page:78(p)
+#: C/create-account.page:109(section/p)
 msgid ""
-"Any conversations that matched your search terms will be shown in the list "
-"below the search field. By default, conversations are ordered by date."
+"You do not need to register for an account to use IRC. Although you specify "
+"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
+"is only established each time you connect. If another user is using the "
+"nickname, you will need to choose a new nickname."
 msgstr ""
-"Jegliche Unterhaltungen, die auf Ihre Suchbegriffe zutreffen, werden in der "
-"Liste unterhalb des Suchfeldes angezeigt. Per Vorgabe sind die Unterhaltungen "
-"nach Datum geordnet."
+"Sie müssen kein Konto registrieren, um das IRC zu benutzen. Obgleich Sie "
+"beim Hinzufügen eines IRC-Kontos in <app>Empathy</app> einen Spitznamen "
+"angeben, wird dieser Spitzname zwar jedes Mal bei einem Verbindungsaufbau "
+"festgelegt. Falls aber ein anderer Benutzer diesen Spitznamen verwendet, "
+"müssen Sie einen neuen wählen."
 
-#: C/prev-conv.page:82(p)
+#: C/create-account.page:114(section/p)
 msgid ""
-"Click on a conversation to view it. <app>Empathy</app> will select the text "
-"in the conversation that matched your search terms."
+"Some IRC networks use a service called NickServ to allow users to protect "
+"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
 msgstr ""
-"Klicken Sie auf eine Unterhaltung, um sie zu betrachten. <app>Empathy</app> "
-"hebt in der Unterhaltung den Text hervor, der Ihren Suchbegriffen entspricht."
-
-#: C/prev-conv.page:89(title)
-msgid "Browse previous conversations"
-msgstr "Vorherige Unterhaltungen betrachten"
+"Einige IRC-Netzwerke verwenden einen Dienst namens NickServ, um Benutzern zu "
+"ermöglichen, ihre Spitznamen zu schützen. Weitere Informationen finden Sie "
+"in <link xref=\"irc-nick-password\"/>."
 
-#: C/prev-conv.page:91(p)
+#: C/create-account.page:117(section/p)
 msgid ""
-"You can browse your previous conversations with your contacts or in chat "
-"rooms by date."
+"Some IRC servers are password protected. You will need to know the password "
+"to connect to these servers. Generally, these are private IRC networks."
 msgstr ""
-"Sie können Ihre früheren Unterhaltungen mit Ihren Kontakten oder in "
-"Unterhaltungsräumen anhand des Datums durchsuchen."
+"Einige IRC-Server sind passwortgeschützt. Sie müssen das Passwort kennen, um "
+"eine Verbindung zu diesen Servern herzustellen. Im Allgemeinen sind dies "
+"private IRC-Netzwerke."
 
-#: C/prev-conv.page:100(p)
-msgid "Select the <gui>Conversations</gui> tab."
-msgstr "Wählen Sie den Reiter <gui>Unterhaltungen</gui>."
+#: C/create-account.page:122(section/title)
+msgid "Proprietary Services"
+msgstr "Proprietäre Dienste"
 
-#: C/prev-conv.page:103(p)
+#: C/create-account.page:124(section/p)
 msgid ""
-"Select an account from the drop-down list in the top left. A list of contacts "
-"and chat room for that account will be shown below."
+"There are many proprietary instant messaging services that have been "
+"developed by different companies or organizations. <app>Empathy</app> allows "
+"you to connect to an existing account for most popular services. To create a "
+"new account with one of these services, you will need to visit the service’s "
+"web site and agree to its terms of use."
 msgstr ""
-"Wählen Sie ein Konto in der Auswahlliste oben links. Eine Liste der Kontakte "
-"und Unterhaltungsräume für dieses Konto wird darunter angezeigt."
+"Es gibt zahlreiche proprietäre Sofortnachrichtendienste, die von "
+"verschiedenen Unternehmen oder Organisationen entwickelt wurden. "
+"<app>Empathy</app> ermöglicht Ihnen für die populärsten dieser Dienste die "
+"Verbindung zu einem vorhandenen Konto. Um ein Konto bei einem dieser Dienste "
+"anzulegen, besuchen Sie bitte die Webseite des jeweiligen Anbieters. "
+"Bestätigen Sie dort die Nutzungsbedingungen."
 
-#: C/prev-conv.page:107(p)
-msgid ""
-"Select a contact or chat room to view your previous conversations from. By "
-"default the most recent conversation will be shown."
-msgstr ""
-"Wählen Sie einen Kontakt oder Unterhaltungsraum, um dessen frühere "
-"Unterhaltungen zu betrachten. Per Vorgabe wird die letzte Unterhaltung "
-"angezeigt."
+#: C/create-account.page:132(item/p)
+msgid "<link href=\"http://dashboard.aim.com/aim\">AIM</link>"
+msgstr "<link href=\"http://dashboard.aim.com/aim\">AIM</link>"
 
-#: C/prev-conv.page:111(p)
-msgid ""
-"You can browse your conversations by date. Days on which you had a "
-"conversation with the selected contact will be shown in bold text. Click a "
-"date to select it. Click the arrows next to the month and year to browse "
-"earlier dates."
-msgstr ""
-"Sie können Ihre Unterhaltungen anhand des Datums durchsuchen. Die Tage, an "
-"denen Sie eine Unterhaltung mit dem ausgewählten Kontakt geführt haben, "
-"werden fett hervorgehoben. Klicken Sie auf ein Datum, um es auszuwählen. "
-"Klicken Sie auf die Pfeile neben den Monats- und Jahresangaben, um zu "
-"früheren Daten zu gehen."
+#: C/create-account.page:137(item/p)
+msgid "<link href=\"https://www.icq.com/register/\">ICQ</link>"
+msgstr "<link href=\"https://www.icq.com/register/\">ICQ</link>"
 
-#: C/prev-conv.page:117(p)
-msgid ""
-"You can search for text in the displayed conversation by typing into the "
-"search field at the top. The matching text will be highlighted."
-msgstr ""
-"Sie können nach Text in der angezeigten Unterhaltung suchen, indem Sie ihn in "
-"das Suchfeld oben eingeben. Der damit übereinstimmende Text wird "
-"hervorgehoben."
+#: C/create-account.page:142(item/p)
+msgid "<link href=\"https://accountservices.passport.net\">MSN</link>"
+msgstr "<link href=\"https://accountservices.passport.net\">MSN</link>"
 
-#: C/prev-conv.page:121(p)
-msgid ""
-"You can quickly view the previous conversations with one of your contacts "
-"from the <gui>Contact List</gui> window. Simply right click the contact and "
-"choose <gui>View Previous Conversations</gui>. The <gui>Previous "
-"Conversations</gui> window will open with that contact already selected."
-msgstr ""
-"Im <gui>Kontaktlisten</gui>-Fenster können Sie schnell die früheren "
-"Unterhaltungen mit einem Ihrer Kontakte betrachten. Klicken Sie einfach mit "
-"der rechten Maustaste auf den Kontakt und wählen Sie <gui>Vorherige "
-"Unterhaltungen anschauen</gui>. Das Fenster <gui>Vorherige Unterhaltungen</"
-"gui> für den bereits ausgewählten Kontakt wird geöffnet."
+#: C/create-account.page:147(item/p)
+msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
+msgstr "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
 
-#: C/link-contacts.page:11(desc)
-msgid "Merge and separate different contacts into a single one."
+#: C/disable-account.page:9(info/desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
 msgstr ""
-"Verschiedene Kontakte in einen einzigen zusammenführen oder diese aufteilen."
+"<app>Empathy</app> daran hindern, die Verbindung zu einem Konto automatisch "
+"herzustellen."
 
-#: C/link-contacts.page:25(title)
-msgid "Combine and separate contacts"
-msgstr "Kontakte zusammenlegen und aufteilen"
+#: C/disable-account.page:40(page/title)
+msgid "Disable an account"
+msgstr "Deaktivieren eines Kontos"
 
-#: C/link-contacts.page:26(p)
+#: C/disable-account.page:42(page/p)
 msgid ""
-"If one, or more, of your contacts has multiple accounts with different "
-"messaging services, you can combine these contacts into a single one."
+"You can disable an account to prevent <app>Empathy</app> from logging in to "
+"it without removing the account entirely. You may wish to disable and re-"
+"enable an account if you only want to be logged in to the account at certain "
+"times, but you still want to use <app>Empathy</app> for other accounts."
 msgstr ""
-"Wenn ein oder mehrere Kontakte verschiedene Konten bei unterschiedlichen "
-"Nachrichtendiensten haben, so können Sie diese Kontakte in einen einzigen "
-"zusammenlegen."
+"Sie können ein Konto deaktivieren, um zu verhindern, dass <app>Empathy</app> "
+"sich an diesem Konto anmeldet. Das Konto wird dabei nicht völlig entfernt. "
+"Vielleicht wollen Sie ein Konto deaktivieren und erneut aktivieren, wenn Sie "
+"nur zeitweise angemeldet sein wollen, aber <app>Empathy</app> noch für "
+"andere Konten nutzen wollen."
 
-#: C/link-contacts.page:30(p)
+#: C/disable-account.page:53(item/p)
 msgid ""
-"The resulting contact is called a <em>meta-contact</em>: a contact composed "
-"from different single contacts."
+"Select the account you wish to disable from the accounts list on the left "
+"side of the window."
 msgstr ""
-"Der entstehende Kontakt wird als <em>Meta-Kontakt</em> bezeichnet: Ein "
-"Kontakt, der aus unterschiedlichen einzelnen Kontakten gebildet wird."
+"Wählen Sie das Konto, das Sie aus der Kontenliste entfernen wollen, an der "
+"linken Seite des Dialogs aus."
 
-#: C/link-contacts.page:34(p)
-msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
-msgstr ""
-"Wenn Sie einen Kontakt »Janina Schmitt« haben, der drei verschiedene "
-"Nachrichtendienste verwende, wie z.B.:"
+#: C/disable-account.page:57(item/p)
+msgid "On the right side of the window, switch it off."
+msgstr "Schalten Sie es an der rechten Seite des Fensters aus."
 
-#: C/link-contacts.page:40(p)
-msgid "janes@facebook"
-msgstr "janinas@facebook"
+#: C/disable-account.page:62(page/p)
+msgid "To re-enable the account, switch it on."
+msgstr "Um das Konto erneut zu aktivieren, schalten Sie es ein."
 
-#: C/link-contacts.page:45(p)
-msgid "jane.smith@gmail"
-msgstr "Janina Schmitt@gmail"
+#: C/favorite-rooms.page:10(info/desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "Einrichten, Betreten und Verwalten bevorzugter Räume."
 
-#: C/link-contacts.page:50(p)
-msgid "jane_smith@hotmail"
-msgstr "Janina_Schmitt@hotmail"
+#: C/favorite-rooms.page:29(page/title)
+msgid "Favorite rooms"
+msgstr "Bevorzugte Räume"
 
-#: C/link-contacts.page:55(p)
-msgid "You can combine these contacts into a single Jane Smith one."
-msgstr "Dann können Sie diese Kontakte in einen einzigen zusammenlegen."
+#: C/favorite-rooms.page:32(section/title)
+msgid "Set a room as a favorite"
+msgstr "Einen Raum als bevorzugt einrichten"
 
-#: C/link-contacts.page:60(title)
-msgid "Combining contacts"
-msgstr "Kontakte zusammenlegen"
+#: C/favorite-rooms.page:35(item/p)
+msgid "Join a room."
+msgstr "Betreten eines Raumes."
 
-#: C/link-contacts.page:63(p)
+#: C/favorite-rooms.page:40(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, right-click one of the contact that "
-"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
-"gui>."
+"See <link xref=\"irc-join-room\"/> for more information on how to join an "
+"IRC room."
 msgstr ""
-"Klicken Sie mit der rechten Maustaste im Fenster <gui>Kontaktliste</gui> auf "
-"einen Kontakt, der verschiedene Konten verwendet, und wählen Sie <gui style="
-"\"menuitem\">Kontakte verknüpfen …</gui>."
+"In <link xref=\"irc-join-room\"/> finden Sie weitere Informationen über das "
+"Betreten eines Raumes im IRC."
 
-#: C/link-contacts.page:70(p)
+#: C/favorite-rooms.page:46(item/p)
 msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
+"See <link xref=\"group-conversations\"/> for more information on how to "
+"start or join a group conversation."
 msgstr ""
-"Wählen Sie in der linken Seitenleiste im Fenster <gui>Kontakte verknüpfen</"
-"gui> die Kontakte aus, die Sie zusammenlegen wollen."
-
-#: C/link-contacts.page:76(p)
-msgid "Click <gui style=\"button\">Link</gui>."
-msgstr "Klicken Sie auf <gui style=\"button\">Verknüpfen</gui>."
+"In <link xref=\"group-conversations\"/> finden Sie weitere Informationen "
+"über das Starten oder Teilnehmen an einer Gruppenunterhaltung."
 
-#: C/link-contacts.page:82(p)
+#: C/favorite-rooms.page:54(item/p)
 msgid ""
-"When a meta-contact has been created, the default contact that will be used "
-"to have a conversation with when you double-click on it, is the contact with "
-"the highest presence on-line."
+"From the conversation window, choose <guiseq><gui>Conversation</"
+"gui><gui>Favorite Chat Room</gui></guiseq>."
 msgstr ""
-"Wenn ein Meta-Kontakt erstellt wurde wird derjenige Kontakt bei einer "
-"Unterhaltung verwendet, der die längste Zeit angemeldet ist."
+"Wählen Sie im Unterhaltungsfenster <guiseq><gui>Unterhaltung</"
+"gui><gui>Favorisierter Chatraum</gui></guiseq>."
 
-#: C/link-contacts.page:91(title)
-msgid "Separating contacts"
-msgstr "Kontakte aufteilen"
+#: C/favorite-rooms.page:63(section/title)
+msgid "Join favorite rooms"
+msgstr "Betreten bevorzugter Räume"
 
-#: C/link-contacts.page:94(p)
-msgid ""
-"From the <gui>Contact List</gui>, right-click the contact to separate, and "
-"select <gui style=\"menuitem\">Link Contacts...</gui>."
+#: C/favorite-rooms.page:66(item/p) C/send-file.page:40(item/p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
 msgstr ""
-"Wählen Sie in der <gui>Kontakliste</gui> den Kontakt mit der rechten "
-"Maustaste aus, den Sie aufteilen möchten, und wählen Sie <gui style=\"menuitem"
-"\">Kontakte verknüpfen …</gui>."
-
-#: C/link-contacts.page:100(p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "Klicken Sie auf <gui style=\"button\">Verknüpfung aufheben</gui>."
-
-#: C/license.page:8(desc)
-msgid "Legal information."
-msgstr "Rechtliche Hinweise."
+"Führen Sie im <gui>Kontaktlisten</gui>-Fenster eine der folgenden Aktionen "
+"aus:"
 
-#: C/license.page:11(title)
-msgid "License"
-msgstr "Lizenz"
+#: C/favorite-rooms.page:71(item/p)
+msgid "Press <key>F5</key>."
+msgstr "Drücken Sie <key>F5</key>."
 
-#: C/license.page:12(p)
+#: C/favorite-rooms.page:76(item/p)
 msgid ""
-"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
-"Unported license."
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
+"all your favorite rooms."
 msgstr ""
-"Dieses Werk wird unter einer »CreativeCommons Attribution-Share Alike 3.0 "
-"Unported license« verbreitet."
-
-#: C/license.page:20(p)
-msgid "You are free:"
-msgstr "Es ist Ihnen gestattet:"
-
-#: C/license.page:25(em)
-msgid "To share"
-msgstr "Freizugeben"
+"Wählen Sie <guiseq><gui>Raum</gui><gui>Favoriten betreten</gui></guiseq>, um "
+"alle Ihre bevorzugten Räume zu betreten."
 
-#: C/license.page:26(p)
-msgid "To copy, distribute and transmit the work."
+#: C/favorite-rooms.page:82(item/p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
 msgstr ""
-"Das Werk bzw. den Inhalt zu vervielfältigen, zu verbreiten und öffentlich "
-"zugänglich zu machen."
-
-#: C/license.page:29(em)
-msgid "To remix"
-msgstr "Änderungen vorzunehmen"
-
-#: C/license.page:30(p)
-msgid "To adapt the work."
-msgstr "Abwandlungen und Bearbeitungen des Werkes bzw. Inhaltes anzufertigen."
-
-#: C/license.page:33(p)
-msgid "Under the following conditions:"
-msgstr "Unter den folgenden Bedingungen:"
-
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "Weitergabe"
+"Wählen Sie <gui>Raum</gui>, und wählen Sie den bevorzugten Raum aus, den Sie "
+"betreten wollen."
 
-#: C/license.page:39(p)
+#: C/favorite-rooms.page:90(note/p)
 msgid ""
-"You must attribute the work in the manner specified by the author or licensor "
-"(but not in any way that suggests that they endorse you or your use of the "
-"work)."
+"To join a favorite room, you need to be connected to the Internet and to "
+"your account."
 msgstr ""
-"Sie dürfen das Werk nur unter gleichen Bedingungen weitergeben, wie Sie vom "
-"Autor oder Lizenzgeber festgelegt wurden (aber nicht so, dass es wie Ihr Werk "
-"aussieht)."
+"Um einen bevorzugten Raum zu betreten, müssen Sie mit dem Internet und mit "
+"Ihrem Konto verbunden sein."
 
-#: C/license.page:46(em)
-msgid "Share Alike"
-msgstr "Share Alike"
+#: C/favorite-rooms.page:98(section/title)
+msgid "Manage favorite rooms"
+msgstr "Raumfavoriten verwalten"
 
-#: C/license.page:47(p)
+#: C/favorite-rooms.page:101(item/p)
 msgid ""
-"If you alter, transform, or build upon this work, you may distribute the "
-"resulting work only under the same, similar or a compatible license."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Manage Favorites</gui></guiseq>."
 msgstr ""
-"Wenn Sie das lizenzierte Werk bzw. den lizenzierten Inhalt bearbeiten, "
-"abwandeln oder in anderer Weise erkennbar als Grundlage für eigenes Schaffen "
-"verwenden, dürfen Sie die daraufhin neu entstandenen Werke bzw. Inhalte nur "
-"unter Verwendung von Lizenzbedingungen weitergeben, die mit denen dieses "
-"Lizenzvertrages identisch, vergleichbar oder kompatibel sind."
+"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Raum</"
+"gui><gui>Favoriten verwalten</gui></guiseq>."
 
-#: C/license.page:53(p)
+#: C/favorite-rooms.page:107(item/p)
 msgid ""
-"For the full text of the license, see the <link href=\"http://creativecommons."
-"org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</link>, or read "
-"the full <link href=\"http://creativecommons.org/licenses/by-sa/3.0/"
-"\">Commons Deed</link>."
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"manage the favorite rooms of."
 msgstr ""
-"Den vollständigen Text der Lizenz finden sie auf der <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons-Webseite</"
-"link>. Oder Sie können den vollständigen <link href=\"http://creativecommons."
-"org/licenses/by-sa/3.0/\">Commons Deed</link> lesen."
-
-#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation with an IRC contact."
-msgstr "Eine Unterhaltung mit einem IRC-Kontakt starten."
+"Aus der <guilabel>Konto</guilabel>-Aufklappliste wählen Sie das Konto, "
+"dessen bevorzugte Räume Sie verwalten wollen."
 
-#: C/irc-start-conversation.page:30(title)
-msgid "Chat with somebody on IRC"
-msgstr "Eine Unterhaltung mit jemandem im IRC führen"
+#: C/favorite-rooms.page:111(item/p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr "Wählen Sie <gui>Alle</gui>, um alle Ihre bevorzugten Räume zu sehen."
 
-#: C/irc-start-conversation.page:32(p)
-msgid ""
-"You can hold private conversations with other IRC users, outside of the "
-"public IRC chat rooms. To start a conversation with another IRC user:"
-msgstr ""
-"Sie können private Unterhaltungen mit anderen IRC-Benutzern außerhalb der "
-"öffentlichen IRC-Unterhaltungsräume führen. So beginnen Sie eine Unterhaltung "
-"mit einem anderen IRC-Benutzer:"
+#: C/favorite-rooms.page:116(item/p)
+msgid "Select the favorite room you want to manage:"
+msgstr "Wählen Sie den bevorzugten Raum, den Sie verwalten wollen:"
 
-#: C/irc-start-conversation.page:37(p)
+#: C/favorite-rooms.page:121(item/p)
 msgid ""
-"In the contact list for an IRC chat room, double click the name of the user "
-"you want to chat with. Alternatively, right click the name of the user and "
-"choose <gui>Chat</gui>."
+"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
+"that room when you connect to your account."
 msgstr ""
-"Klicken Sie doppelt in der Kontaktliste für einen IRC-Unterhaltungsraum auf "
-"den Namen des Benutzers, mit dem Sie eine Unterhaltung führen wollen. "
-"Alternativ klicken Sie mit der rechten Maustaste auf den Spitznamen des "
-"Benutzers und wählen <gui>Unterhaltung</gui>."
+"Aktivieren Sie das Ankreuzfeld <gui>Auto-Verbinden</gui>, um einen Raum "
+"immer dann automatisch zu betreten, wenn Sie sich an Ihrem Konto anmelden."
 
-#: C/irc-start-conversation.page:45(p)
-msgid ""
-"The IRC room contact list is not the same as <app>Empathy</app> contact list. "
-"It contains a list of users in the IRC chat room you joined. Different rooms "
-"can have different contacts listed."
+#: C/favorite-rooms.page:127(item/p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
 msgstr ""
-"Die Kontaktliste in IRC-Unterhaltungsräumen ist nicht mit der Kontaktliste in "
-"<app>Empathy</app> vergleichbar. Sie enthält eine Liste von Benutzern des "
-"Raumes, den Sie betreten haben. Verschiedene Räume können unterschiedliche "
-"Kontaktlisten haben."
+"Klicken Sie auf <gui>Entfernen</gui>, um den Raum aus Ihren bevorzugten "
+"Räumen zu entfernen."
 
-#: C/irc-start-conversation.page:52(p)
-msgid ""
-"The IRC room contact list is usually on the right side of the IRC room "
-"window. If you do not see it, choose <guiseq><gui>Conversation</gui><gui>Show "
-"Contact List</gui></guiseq>."
-msgstr ""
-"Die Kontaktliste des IRC-Raumes befindet sich üblicherweise an der rechten "
-"Seite des IRC-Fensters. Falls sie nicht angezeigt wird, wählen Sie "
-"<guiseq><gui>Unterhaltung</gui><gui>Kontaktliste anzeigen</gui></guiseq>."
+#: C/favorite-rooms.page:134(item/p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "Sobald Sie fertig sind, klicken Sie auf <gui>Schließen</gui>."
 
-#: C/irc-send-file.page:9(desc)
-msgid "<app>Empathy</app> does not currently support sending files using IRC."
-msgstr ""
-"Derzeit ist es nicht möglich, mit <app>Empathy</app> Dateien im IRC zu "
-"versenden."
+#: C/geolocation.page:8(info/desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "Benutzung von und Erläuterungen zur Geoposition in <gui>Empathy</gui>."
 
-#: C/irc-send-file.page:31(title)
-msgid "Send files over IRC"
-msgstr "Dateien im IRC senden"
+#: C/geolocation.page:32(page/title)
+msgid "Geographical position"
+msgstr "Die geografische Position"
 
-#: C/irc-send-file.page:33(p)
-msgid "It is not currently possible to send files using IRC."
-msgstr "Derzeit ist es nicht möglich, Dateien im IRC zu versenden."
+#: C/geolocation.page:35(section/title)
+msgid "Geolocation"
+msgstr "Geoposition"
 
-#: C/irc-nick-password.page:10(desc)
-msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr ""
-"Schützen Sie Ihren Spitznamen, um zu verhindern, dass andere IRC-Benutzer ihn "
-"verwenden."
+#: C/geolocation.page:39(section/title)
+msgid "Fix common problems"
+msgstr "Behebung häufig auftretender Probleme"
 
-#: C/irc-nick-password.page:33(title)
-msgid "Use a nickname password on IRC"
-msgstr "Verwenden eines Passworts für einen Spitznamen im IRC"
+#: C/geolocation-not-showing.page:8(info/desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "<app>Empathy</app> übermittelt meine geografische Position nicht."
 
-#: C/irc-nick-password.page:35(p)
-msgid ""
-"On some IRC networks, you can register your nickname with a service called "
-"NickServ. By sending special messages to NickServ, you can set your password "
-"and identify yourself. Some IRC chat rooms may not allow you to join without "
-"a registered nickname."
-msgstr ""
-"In einigen IRC-Netzwerken können Sie Ihren Spitznamen mittels eines Dienstes "
-"namens NickServ registrieren. Durch spezielle Meldungen an NickServ können "
-"Sie Ihr Passwort festlegen und sich selbst identifizieren. Manche IRC-"
-"Unterhaltungsräume können Sie ohne einen registrierten Spitznamen nicht "
-"betreten."
+#: C/geolocation-not-showing.page:32(page/title)
+msgid "Geographical position not published"
+msgstr "Geografische Position wird nicht veröffentlicht"
 
-#: C/irc-nick-password.page:40(p)
+#: C/geolocation-not-showing.page:34(page/p)
 msgid ""
-"<app>Empathy</app> does not currently support nickname registration. Some IRC "
-"networks, however, will automatically forward a <em>server password</em> to "
-"NickServ. On these networks, you can use the IRC password in <app>Empathy</"
-"app> to identify yourself to NickServ. The popular freenode network is known "
-"to have this feature."
-msgstr ""
-"<app>Empathy</app> unterstützt gegenwärtig die Registrierung von Spitznamen "
-"nicht. Einige IRC-Netzwerke leiten jedoch automatisch ein <em>Serverpasswort</"
-"em> an NickServ weiter. In diesen Netzwerken können Sie das IRC-Passwort in "
-"<app>Empathy</app> verwenden, um sich bei NickServ zu identifizieren. Das "
-"populäre FreeNode-Netzwerk verfügt bekanntermaßen über dieses "
-"Funktionsmerkmal."
-
-#: C/irc-nick-password.page:46(p)
-msgid "To set an IRC server password:"
-msgstr "So legen Sie ein IRC-Serverpasswort fest:"
-
-#: C/irc-nick-password.page:54(p)
-msgid "Select the IRC account from the list on the left of the dialog."
+"If your contacts cannot see your location, <app>Empathy</app> might not be "
+"able to discover with a good margin of precision your geographical position."
 msgstr ""
-"Wählen Sie das IRC-Konto aus der Liste an der linken Seite des Dialogs aus."
+"Falls Ihre Kontakte Ihren Ort nicht sehen können, dann ist <app>Empathy</"
+"app> möglicherweise nicht in der Lage, Ihren Ort mit einer hinreichenden "
+"Genauigkeit zu bestimmen."
 
-#: C/irc-nick-password.page:57(p)
+#: C/geolocation-not-showing.page:38(page/p)
 msgid ""
-"In the <gui>Password</gui> field, type the password you used to register your "
-"nikcname."
+"In this case, your position will not be published, but you are still able to "
+"see the location of your contacts."
 msgstr ""
-"Geben Sie im Textfeld <gui>Passwort</gui> das Passwort ein, dass Sie bei der "
-"Registrierung Ihres Spitznamens verwendet haben."
-
-#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
-msgid "Click <gui style=\"button\">Apply</gui>."
-msgstr "Klicken Sie auf <gui style=\"button\">Anwenden</gui>."
+"In diesem Fall wird Ihre Position nicht übermittelt, aber Sie sind weiterhin "
+"in der Lage, die Position Ihrer Kontakte zu sehen."
 
-#: C/irc-nick-password.page:69(p)
+#: C/geolocation-not-showing.page:42(page/p)
 msgid ""
-"These instructions only allow you to use a password-protected nickname on "
-"certain IRC networks. It is not currently possible to register an IRC "
-"nickname or change your nickname password using <app>Empathy</app>."
+"If you want to publish your geographical position, you can try to use an "
+"external device such as a GPS."
 msgstr ""
-"Diese Anweisungen erlauben Ihnen lediglich die Verwendung eines "
-"passwortgeschützten Spitznamens in verschiedenen IRC-Netzwerken. Es ist "
-"gegenwärtig nicht möglich, mit <app>Empathy</app> einen IRC-Spitznamen zu "
-"registrieren oder das Passwort für Ihren Spitznamen zu ändern."
-
-#: C/irc-manage.page:10(desc)
-msgid "How to use IRC with <app>Empathy</app>."
-msgstr "Benutzung des IRC mit <app>Empathy</app>."
-
-#: C/irc-manage.page:35(title)
-msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relay Chat (IRC)"
+"Zum Übermitteln Ihrer geografischen Position können Sie ein externes Gerät "
+"verwenden, wie beispielsweise ein GPS-Gerät."
 
-#: C/irc-manage.page:38(p) C/account-irc.page:39(p)
+#: C/geolocation-not-showing.page:48(note/p)
 msgid ""
-"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
-"<app>Empathy</app>."
+"In order to publish your geographical location, your Jabber server needs to "
+"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
+"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
+"PEP</link> is maintained online. Google Talk does not support this feature "
+"at this time."
 msgstr ""
-"Sie müssen das Paket <sys>telepathy-idle</sys> installiert haben, um das IRC "
-"in <app>Empathy</app> nutzen zu können."
-
-#: C/irc-manage.page:42(link)
-msgid "Install telepathy-idle"
-msgstr "telepathy-idle installieren"
-
-#: C/irc-manage.page:49(title)
-msgid "IRC Chat Rooms and Conversations"
-msgstr "IRC-Räume und Unterhaltungen"
-
-#: C/irc-manage.page:51(title)
-msgid "Chat Rooms and Conversations"
-msgstr "Unterhaltungsräume und Unterhaltungen"
-
-#: C/irc-manage.page:56(title)
-msgid "Common IRC Problems"
-msgstr "Häufige Probleme im IRC"
+"Um Ihre geografische Position übermitteln zu können, muss Ihr Jabber-Server "
+"das »Personal Eventing Protocol« (PEP) unterstützen. Eine Liste von <link "
+"href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">Servern mit "
+"PEP-Unterstützung</link> wird im Internet gepflegt. Google Talk unterstützt "
+"dieses Funktionsmerkmal derzeit nicht."
 
-#: C/irc-manage.page:58(title) C/index.page:55(title)
-msgid "Common Problems"
-msgstr "Häufig auftretende Probleme"
+#: C/geolocation-privacy.page:8(info/desc)
+msgid "What information are sent and to who."
+msgstr "Welche Informationen gesendet werden und an wen."
 
-#: C/irc-join-room.page:8(desc)
-msgid "Join an IRC channel."
-msgstr "Betreten eines IRC-Kanals."
+#: C/geolocation-privacy.page:32(page/title)
+msgid "Geolocation Privacy"
+msgstr "Datenschutz bei Geoposition"
 
-#: C/irc-join-room.page:31(title)
-msgid "Join an IRC chat room"
-msgstr "Betreten eines IRC-Unterhaltungsraumes"
+#: C/geolocation-privacy.page:35(section/title)
+msgid "What information is sent"
+msgstr "Gesendete Informationen"
 
-#: C/irc-join-room.page:33(p)
+#: C/geolocation-privacy.page:36(section/p)
 msgid ""
-"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
-"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
-"account\"/> and <link xref=\"account-irc\"/>."
+"What is possible to send is: your country, region, locality, area, street, "
+"building, floor, room, and postal code, longitude, latitude and altitude, "
+"speed and bearing."
 msgstr ""
-"Sie können IRC-Unterhaltungsräume (auch als IRC-Kanäle bekannt) in jedem IRC-"
-"Netzwerk betreten, mit dem Sie verbunden sind. Weitere Informationen hierzu "
-"finden Sie in <link xref=\"add-account\"/> und <link xref=\"account-irc\"/>."
+"Gesendet werden können: Ihr Land, Bundesland, Ort, Bereich, Straße, Gebäude, "
+"Etage und Raum sowie Ihre Postleitzahl, der Längengrad, der Breitengrad, die "
+"Höhe über dem Meeresspiegel, die Geschwindigkeit die Funkpeilung."
 
-#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
-#: C/group-conversations.page:122(p)
+#: C/geolocation-privacy.page:40(section/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Join</gui></guiseq>."
+"The accuracy and the quantity of information about your geographical "
+"position are based on the software or on the infrastructure used to discover "
+"your position."
 msgstr ""
-"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Raum</"
-"gui><gui>Betreten</gui></guiseq>."
+"Die Genauigkeit und die Menge der verfügbaren Informationen über Ihre "
+"geografische Position hängen von der Software oder der Infrastruktur ab, die "
+"für die Ermittlung Ihrer Position zum Einsatz kommt."
 
-#: C/irc-join-room.page:45(p)
+#: C/geolocation-privacy.page:44(section/p)
 msgid ""
-"From the <gui>Account</gui> drop-down list, select the IRC account that "
-"corresponds to the network you want to use."
+"Different kind of networks may have different accuracy settings, and may "
+"send different information. The use of external devices such as GPS or "
+"mobile phone will increase the accuracy of the information sent."
 msgstr ""
-"Aus der <gui>Konto</gui>-Auswahlliste wählen Sie das IRC-Konto, das zu dem "
-"Netzwerk gehört, welches Sie verwenden wollen."
+"Verschiedene Arten von Netzwerken haben unterschiedliche "
+"Genauigkeitseinstellungen und senden daher verschiedene Informationen. Die "
+"Benutzung externer Geräte wie GPS oder Mobiltelefone erhöht die Genauigkeit "
+"der gesendeten Informationen."
 
-#: C/irc-join-room.page:51(p)
+#: C/geolocation-privacy.page:49(section/p)
 msgid ""
-"In the <gui>Room</gui> text box, type the name of the channel you want to "
-"join. IRC channel names start with the hash character (<sys>#</sys>)."
+"When the privacy mode is enabled, nothing more precise than your city will "
+"be sent, even if you are using an external device."
 msgstr ""
-"Geben Sie in das <guilabel>Raum</guilabel>-Textfeld den Namen des Channels "
-"ein, den Sie betreten wollen. Die Namen der IRC-Kanäle beginnen mit einem "
-"Raute-Zeichen (<sys>#</sys>)."
-
-#: C/irc-join-room.page:57(p)
-msgid "Click <gui>Join</gui> to enter the room."
-msgstr "Klicken Sie auf <gui>Betreten</gui>, um den Raum zu betreten."
+"Wenn der Privatsphäre-Modus aktiviert ist, wird nichts Genaueres als "
+"lediglich Angaben über die Stadt gesendet, in der Sie sich befinden, selbst "
+"dann, wenn Sie ein externes Gerät verwenden."
 
-#: C/irc-join-room.page:64(p)
-msgid ""
-"To join multiple rooms, you need to repeat the steps above for each room."
-msgstr ""
-"Um mehrere Räume zu betreten, müssen Sie die oben genannten Schritte für "
-"jeden Raum wiederholen."
+#: C/geolocation-privacy.page:56(section/title)
+msgid "Who can see the information sent"
+msgstr "Wer die gesendeten Informationen sehen kann"
 
-#: C/irc-join-pwd.page:9(desc)
-msgid "Enter password-protected IRC chat rooms."
-msgstr "Betreten von passwortgeschützten Räumen im IRC"
+#: C/geolocation-privacy.page:57(section/p)
+msgid "Only your contacts can see your geographical position."
+msgstr "Nur Ihre Kontakte können Ihre geografische Position sehen."
 
-#: C/irc-join-pwd.page:25(title)
-msgid "Join a protected IRC chat room"
-msgstr "Betreten eines passwortgeschützten Raumes im IRC"
+#: C/geolocation-privacy.page:63(section/title)
+msgid "What is the privacy mode"
+msgstr "Datenschutzmodus"
 
-#: C/irc-join-pwd.page:27(p)
+#: C/geolocation-privacy.page:64(section/p)
 msgid ""
-"On some IRC networks, private IRC rooms may be protected with a password. If "
-"you know the password, use the following steps to join:"
+"The privacy mode, enabled by default, is a reduced accuracy mode that will "
+"decrease the accuracy of the geographical position sent to your contacts."
 msgstr ""
-"In einigen IRC-Netzwerken können private IRC-Räume durch ein Passwort "
-"geschützt sein. Falls Sie das Passwort kennen, gehen Sie wie folgt vor, um "
-"den Raum zu betreten:"
+"Der per Vorgabe aktivierte Privatsphäre-Modus ist ein Modus mit verminderter "
+"Genauigkeit. Die Genauigkeit der zu Ihren Kontakten gesendeten geografischen "
+"Position wird dabei verringert."
 
-#: C/irc-join-pwd.page:33(p)
-msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
-msgstr "<link xref=\"irc-join-room\">Betreten Sie den Raum</link> wie gewohnt."
+#: C/geolocation-privacy.page:71(section/title)
+msgid "Privacy overview"
+msgstr "Datenschutz-Ãœberblick"
 
-#: C/irc-join-pwd.page:38(p)
+#: C/geolocation-privacy.page:72(section/p)
 msgid ""
-"Empathy will prompt you for a password. Enter the password for the IRC chat "
-"room and click <gui style=\"button\">Join</gui>."
+"Overview of the various geolocation privacy settings in <app>Empathy</app>."
 msgstr ""
-"<app>Empathy</app> wird Sie nach einem Passwort fragen. Geben Sie das "
-"Passwort für den IRC-Raum ein und klicken Sie auf <gui style=\"button"
-"\">Beitreten</gui>."
+"Überblick über die verschiedenen Privatsphäre-Einstellungen für die "
+"Geoposition in <app>Empathy</app>."
 
-#: C/irc-commands.page:7(desc)
-msgid "The supported IRC commands."
-msgstr "Die unterstützten IRC-Befehle."
+#: C/geolocation-privacy.page:77(item/p)
+msgid "Geolocation is not enabled by default."
+msgstr "Geoposition ist per Vorgabe nicht aktiviert."
 
-#: C/irc-commands.page:18(title)
-msgid "Supported IRC commands"
-msgstr "Unterstützte IRC-Befehle"
+#: C/geolocation-privacy.page:82(item/p)
+msgid "Privacy mode is enabled by default."
+msgstr "Der Datenschutzmodus ist per Vorgabe aktiviert."
 
-#: C/irc-commands.page:19(p)
+#: C/geolocation-privacy.page:87(item/p)
 msgid ""
-"To see the list of the supported IRC commands, in a chat room type <input>/"
-"help</input> and press <key>Enter</key>."
+"Privacy mode prevails even when using external and more precise devices."
 msgstr ""
-"Um eine Liste der unterstützten IRC-Befehle in einem Unterhaltungsraum zu "
-"sehen, geben Sie <input>/help</input> ein und drücken Sie die "
-"<key>Eingabetaste</key>."
-
-#: C/irc-commands.page:24(p)
-msgid "All commands available have a small description on their usage."
-msgstr "Alle Befehle verfügen über eine Kurzbeschreibung der Benutzung."
+"Der Privatsphäre-Modus ist auch dann wirksam, wenn externe und genauere "
+"Geräte benutzt werden."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/introduction.page:41(None)
-msgid ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=54908dcb2588beddb15ef0968d2c2582"
-msgstr "ok"
+#: C/geolocation-privacy.page:92(item/p)
+msgid "Only your contacts can see your position."
+msgstr "Nur Ihre Kontakte können Ihre Position sehen."
 
-#: C/introduction.page:9(desc)
-msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr "Einführung in den <app>Empathy</app>-Sofortnachrichtendienst."
+#: C/geolocation-supported.page:7(info/desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr "Dienste, die Geoposition und Kompatibilität unterstützen."
 
-#: C/introduction.page:21(title)
-msgid "Introduction"
-msgstr "Einführung"
+#: C/geolocation-supported.page:31(page/title)
+msgid "Supported services"
+msgstr "Unterstützte Dienste"
 
-#: C/introduction.page:23(p)
+#: C/geolocation-supported.page:33(page/p)
 msgid ""
-"<app>Empathy</app> is an instant messaging application for the GNOME Desktop. "
-"It supports text messaging, voice &amp; video calls, file transfers, and all "
-"the most used messaging systems such as MSN and Google Talk."
+"The geolocation feature at the moment is compatible only with the Jabber "
+"service. In order to use it, you and your contacts need to have a Jabber "
+"account."
 msgstr ""
-"<app>Empathy</app> ist eine Sofortnachrichten-Anwendung für die GNOME-"
-"Arbeitsumgebung. Textnachrichten, Sprach- und Videoanrufe, Dateiübertragungen "
-"sowie alle gängigen Nachrichtensysteme wie MSN und GoogleTalk werden "
-"unterstützt."
+"Gegenwärtig ist das Geolokation-Funktionsmerkmal ausschließlich mit dem "
+"Jabber-Dienst kompatibel. Um es nutzen zu können, müssen Sie und Ihre "
+"Kontakte über ein Jabber-Konto verfügen."
 
-#: C/introduction.page:28(p)
+#: C/geolocation-supported.page:39(note/p)
 msgid ""
-"<app>Empathy</app> includes features that help you better collaborate while "
-"at work, and that let you easily keep in touch with your friends."
+"It is necessary that also the server you are using supports the geolocation "
+"feature. Most of the Jabber servers support it. See your service website "
+"documentation for more information."
 msgstr ""
-"<app>Empathy</app> bietet Funktionsmerkmale, die Ihnen einerseits die "
-"berufliche Zusammenarbeit erleichtern, aber es auch ermöglichen, mit Ihren "
-"Freunden in Verbindung zu bleiben."
+"Es ist notwendig, dass auch der von Ihnen verwendete Server das Geoposition-"
+"Funktionsmerkmal unterstützt. Die meisten Jabber-Server tun dies. Weitere "
+"Informationen finden Sie auf der Webseite Ihres Dienstes."
 
-#: C/introduction.page:32(p)
+#: C/geolocation-supported.page:47(section/title)
+msgid "Compatibility"
+msgstr "Kompatibilität"
+
+#: C/geolocation-supported.page:49(section/p)
 msgid ""
-"Using <app>Empathy</app>, you can group all the conversations in a single "
-"window, have multiple windows for different kind of conversations, easily "
-"search through your previous conversations, and share your desktop in just "
-"two clicks."
+"<app>Empathy</app> geolocation feature is not compatible with other "
+"geographical position services such as <em>Google Latitude</em>, <em>Yahoo "
+"Fire Eagle</em> or <em>Brightkite</em>."
 msgstr ""
-"In <app>Empathy</app> können Sie alle Unterhaltungen in einem einzigen "
-"Fenster anordnen oder mehrere Fenster für die verschiedenen Arten von "
-"Unterhaltungen verwenden, frühere Unterhaltungen durchsuchen und Ihre "
-"Arbeitsumgebung mit nur zwei Klicks freigeben."
-
-#: C/introduction.page:39(title)
-msgid "<gui>Contact List</gui> window"
-msgstr "<gui>Kontaktlisten</gui>-Fenster"
+"Das Geoposition-Funktionsmerkmal von <app>Empathy</app> ist nicht kompatibel "
+"mit anderen geografischen Ortungsdiensten wie <em>Google Latitude</em>, "
+"<em>Yahoo Fire Eagle</em> oder <em>Brightkite</em>."
 
-#: C/introduction.page:40(desc)
-msgid "<app>Empathy</app> main window"
-msgstr "<app>Empathy</app>-Hauptfenster"
+#: C/geolocation-turn.page:9(info/desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr "Aktivierung und Deaktivierung der Geoposition in <app>Empathy</app>."
 
-#: C/introduction.page:42(p)
-msgid "<app>Empathy</app> main window."
-msgstr "<app>Empathy</app>-Hauptfenster."
+#: C/geolocation-turn.page:33(page/title)
+msgid "Activate/Deactivate geolocation"
+msgstr "Aktivieren oder Deaktivieren der Geolokation"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/index.page:28(None)
-msgid ""
-"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
-msgstr "original"
+#: C/geolocation-turn.page:37(item/p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+msgstr ""
+"Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui></guiseq>."
 
-#: C/index.page:7(title) C/index.page:8(title)
-msgid "Empathy Internet Messenger"
-msgstr "Empathy Internet-Nachrichtendienst"
+#: C/geolocation-turn.page:42(item/p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "Wählen Sie den Reiter <gui>Ort</gui>."
 
-#: C/index.page:27(title)
+#: C/geolocation-turn.page:47(item/p)
 msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
-"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+"Select <gui>Publish location to my contacts</gui> to activate geolocation."
 msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Empathy Internet-Nachrichtendienst-Logo</media> Empathy Internet-"
-"Nachrichtendienst"
-
-#: C/index.page:35(title)
-msgid "Account Management"
-msgstr "Kontenverwaltung"
-
-#: C/index.page:39(title)
-msgid "Contact Management"
-msgstr "Kontaktverwaltung"
-
-#: C/index.page:43(title)
-msgid "Text Conversations"
-msgstr "Text-Unterhaltungen"
-
-#: C/index.page:47(title)
-msgid "Audio and Video Conversations"
-msgstr "Audio- und Video-Unterhaltungen"
-
-#: C/index.page:51(title)
-msgid "Advanced Actions"
-msgstr "Fortgeschrittene Aktionen"
-
-#: C/import-account.page:10(desc)
-msgid "Import an account from another instant messaging application."
-msgstr "Importieren eines Kontos aus einer anderen Sofortnachrichten-Anwendung."
-
-#: C/import-account.page:19(name)
-msgid "Peter Haslam"
-msgstr "Peter Haslam"
-
-#: C/import-account.page:20(email)
-msgid "peter.haslam@freenet.de"
-msgstr "peter.haslam@freenet.de"
+"Wählen Sie <gui>Position an meine Kontakte übermitteln</gui>, um Geoposition "
+"zu aktivieren."
 
-#: C/import-account.page:42(title)
-msgid "Import an existing account"
-msgstr "Importieren eines vorhandenen Kontos"
+#: C/geolocation-turn.page:50(item/p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "Um Geoposition abzuschalten, deaktivieren Sie dies."
 
-#: C/import-account.page:44(p)
+#: C/geolocation-turn.page:55(item/p)
 msgid ""
-"The first time you run <app>Empathy</app>, it will offer to import your "
-"accounts from other instant messaging applications. Currently, the only "
-"supported application is <app>Pidgin</app>."
+"To increase the accuracy of your position, deselect <gui>Reduce location "
+"accuracy</gui>."
 msgstr ""
-"Wenn Sie <app>Empathy</app> zum ersten Mal starten, wird Ihnen der Import von "
-"Konten aus anderen Sofortnachrichten-Anwendungen angeboten. Gegenwärtig wird "
-"als einzige Anwendung <app>Pidgin</app> unterstützt."
+"Um die Genauigkeit Ihrer Position zu erhöhen, deaktivieren Sie "
+"<gui>Positionsgenauigkeit verringern</gui>."
 
-#: C/import-account.page:50(p)
+#: C/geolocation-turn.page:61(item/p)
 msgid ""
-"Run <app>Empathy</app> for the first time. An assistant will offer you a "
-"number of options to create new accounts."
+"If you have an external device like a GPS or want to send a more accurate "
+"position, select the appropriate option in the <gui>Location sources</gui> "
+"section."
 msgstr ""
-"Wenn Sie <app>Empathy</app> zum ersten Mal ausführen, dann bietet Ihnen ein "
-"Assistent eine Reihe von Optionen zum Anlegen neuer Konten an."
+"Falls Sie über ein externes Gerät verfügen, z.B. GPS, oder eine genauere "
+"Position senden wollen, wählen Sie die entsprechende Option im Abschnitt "
+"<gui>Positionsquellen</gui>."
 
-#: C/import-account.page:54(p)
-msgid ""
-"Select <gui>Yes, import my account details from</gui> and click <gui>Forward</"
-"gui>."
-msgstr ""
-"Wählen Sie <gui>Ja, meine Kontodetails importieren von</gui> und klicken Sie "
-"auf <gui>Weiter</gui>."
+#: C/geolocation-what-is.page:9(info/desc)
+msgid "Understanding geolocation."
+msgstr "Erläuterungen zu Geoposition"
 
-#: C/import-account.page:58(p)
-msgid "Select the check box next to each account you wish to import."
-msgstr ""
-"Aktivieren Sie das Ankreuzfeld neben jedem Konto, das Sie importieren wollen."
+#: C/geolocation-what-is.page:33(page/title)
+msgid "What is geolocation"
+msgstr "Was ist eine Geoposition?"
 
-#: C/import-account.page:66(p)
+#: C/geolocation-what-is.page:35(page/p)
 msgid ""
-"It is not currently possible to import accounts after you have completed the "
-"first-run assistant."
+"Geolocation allows you to identify the real geographical location of a "
+"computer or a device connected to the Internet."
 msgstr ""
-"Gegenwärtig ist es nicht möglich, Konten zu importieren, nachdem der "
-"Einrichtungsassistent abgeschlossen ist."
+"Geoposition ermöglicht Ihnen die Ermittlung des wirklichen geografischen "
+"Ortes eines Rechners oder anderen Gerätes, welches mit dem Internet "
+"verbunden ist."
 
-#: C/hide-contacts.page:8(desc)
-msgid "Hide the offline contacts from your <gui>Contact List</gui>."
-msgstr "Verbergen von abgemeldeten Kontakten in Ihrer <gui>Kontaktliste</gui>."
+#: C/geolocation-what-is.page:37(page/p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "Mit der Geoposition in <app>Empathy</app> können Sie:"
 
-#: C/hide-contacts.page:19(title)
-msgid "Hide offline contacts"
-msgstr "Abgemeldete Kontakte verbergen"
+#: C/geolocation-what-is.page:42(item/p)
+msgid "Publish your geographical location to your contacts."
+msgstr "Ihren Kontakten Ihre geografische Position anzeigen."
 
-#: C/hide-contacts.page:21(p)
-msgid ""
-"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
-"with which you can have a conversation, and also those that are offline."
+#: C/geolocation-what-is.page:47(item/p)
+msgid "See your contacts’ geographical location and quickly contact them."
 msgstr ""
-"Normalerweise zeigt <app>Empathy</app> alle Kontakte an: die angemeldeten "
-"Kontakte, mit denen Sie eine Unterhaltung führen können, und diejenigen "
-"Kontakte, die abgemeldet sind."
-
-#: C/hide-contacts.page:25(p)
-msgid "To hide the contacts that are offline:"
-msgstr "So verbergen Sie abgemeldete Kontakte:"
+"Die geografische Position Ihrer Kontakte sehen und direkt eine Verbindung "
+"herstellen."
 
-#: C/hide-contacts.page:31(p)
+#: C/geolocation-what-is.page:52(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</"
-"key><key>H</key></keyseq>."
+"Set the accuracy of your location and the device used to discover your "
+"location."
 msgstr ""
-"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Ansicht</"
-"gui><gui>Abgemeldete Kontakte</gui></guiseq> oder drücken Sie "
-"<keyseq><key>Strg</key><key>H</key></keyseq>."
+"Die Genauigkeit Ihrer Position und das für die Ermittlung der Position "
+"verwendete Gerät sehen."
 
-#: C/hide-contacts.page:36(p)
-msgid "To show the offline contacts again, repeat the same procedure above."
+#: C/geolocation-what-is.page:60(note/p)
+msgid ""
+"In order to see your contacts’ geographical locations, they need to use a "
+"service and an application that supports geolocation."
 msgstr ""
-"Um die abgemeldeten Kontakte wieder anzuzeigen, wiederholen Sie den oben "
-"beschriebenen Vorgang."
+"Um die geografische Position Ihrer Kontakte sehen zu können, müssen diese "
+"einen Dienst und eine Anwendung verwenden, die die Geoposition unterstützt."
 
-#: C/group-conversations.page:8(desc)
+#: C/group-conversations.page:8(info/desc)
 msgid "Start or join a group conversation with your contacts."
-msgstr "Starten oder betreten Sie eine Gruppenunterhaltung mit Ihren Kontakten."
+msgstr ""
+"Starten oder betreten Sie eine Gruppenunterhaltung mit Ihren Kontakten."
 
-#: C/group-conversations.page:34(title)
+#: C/group-conversations.page:34(page/title)
 msgid "Group conversations"
 msgstr "Gruppenunterhaltungen"
 
-#: C/group-conversations.page:36(p)
+#: C/group-conversations.page:36(page/p)
 msgid ""
-"Group conversations permits you to have text conversations with more than one "
-"contact at the same time."
+"Group conversations permits you to have text conversations with more than "
+"one contact at the same time."
 msgstr ""
 "Gruppenunterhaltungen ermöglichen Ihnen Textunterhaltungen mit mehreren "
 "Kontakten zugleich."
 
-#: C/group-conversations.page:40(p)
+#: C/group-conversations.page:40(page/p)
 msgid ""
 "To have a group conversation you need to have a registered account with "
 "either Jabber or Google Talk, or a People Nearby account."
 msgstr ""
 "Für eine Gruppenunterhaltung benötigen Sie ein registriertes Konto bei "
-"entweder Google Talk oder Jabber, oder ein »People Nearby«-Konto."
+"entweder Google Talk oder Jabber, oder ein »People Nearby«-Konto (»Personen "
+"in der Nähe«)."
 
-#: C/group-conversations.page:46(p)
+#: C/group-conversations.page:46(note/p)
 msgid ""
 "You can have a group conversation only with the contacts that are using the "
 "same service as yours."
@@ -1906,11 +1817,20 @@ msgstr ""
 "Eine Gruppenunterhaltung können Sie nur mit denjenigen Kontakten führen, die "
 "den gleichen Dienst wie Sie verwenden."
 
-#: C/group-conversations.page:54(title)
+#: C/group-conversations.page:54(section/title)
 msgid "Start a group conversation"
 msgstr "Starten einer Gruppenunterhaltung"
 
-#: C/group-conversations.page:63(p)
+#: C/group-conversations.page:58(item/p)
+#: C/group-conversations.page:122(item/p) C/irc-join-room.page:39(item/p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Join</gui></guiseq>."
+msgstr ""
+"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Raum</"
+"gui><gui>Betreten</gui></guiseq>."
+
+#: C/group-conversations.page:63(item/p)
 msgid ""
 "From the <gui>Account</gui> drop-down list, select the account you want to "
 "use for the group conversation."
@@ -1918,7 +1838,7 @@ msgstr ""
 "Aus der <guilabel>Konto</guilabel>-Aufklappliste wählen Sie das Konto, "
 "welches Sie für die Gruppenunterhaltung verwenden wollen."
 
-#: C/group-conversations.page:69(p)
+#: C/group-conversations.page:69(item/p)
 msgid ""
 "In the <gui>Server</gui> text box, type the name of server in which the "
 "conversation will be hosted."
@@ -1926,11 +1846,11 @@ msgstr ""
 "Geben Sie in das <guilabel>Server</guilabel>-Textfeld den Namen des Servers "
 "ein, auf dem die Unterhaltung stattfinden soll."
 
-#: C/group-conversations.page:73(p)
+#: C/group-conversations.page:73(item/p)
 msgid "Leave it empty if it will be on the current server."
 msgstr "Lassen Sie dies leer, wenn es sich um den aktuellen Server handelt."
 
-#: C/group-conversations.page:78(p)
+#: C/group-conversations.page:78(item/p)
 msgid ""
 "In the <gui>Room</gui> text box, type the name you want to give to the "
 "conversation."
@@ -1938,7 +1858,7 @@ msgstr ""
 "Geben Sie in das <guilabel>Raum</guilabel>-Textfeld den Namen ein, den Sie "
 "der neuen Unterhaltung zuweisen wollen."
 
-#: C/group-conversations.page:82(p)
+#: C/group-conversations.page:82(note/p)
 msgid ""
 "This will be the name of the room you are going to have a conversation. This "
 "name will be publicly available for other people to join. It is not possible "
@@ -1948,22 +1868,22 @@ msgstr ""
 "öffentlich für Andere einsehbar, um den Raum zu betreten. Es ist nicht "
 "möglich, einen privaten Raum zu erstellen."
 
-#: C/group-conversations.page:90(p)
+#: C/group-conversations.page:90(item/p)
 msgid ""
 "To invite other contacts to join the group conversation, from the "
 "<gui>Contact List</gui> window, select the contact you want to invite, and "
 "perform one of the following:"
 msgstr ""
-"Um im <gui>Kontaktlisten</gui>-Fenster andere Kontakte zur Teilnahme an einer "
-"Gruppenunterhaltung einzuladen, gehen Sie wie folgt vor:"
+"Um im <gui>Kontaktlisten</gui>-Fenster andere Kontakte zur Teilnahme an "
+"einer Gruppenunterhaltung einzuladen, gehen Sie wie folgt vor:"
 
-#: C/group-conversations.page:97(p)
+#: C/group-conversations.page:97(item/p)
 msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
 msgstr ""
 "Klicken Sie mit der rechten Maustaste auf den Kontakt, und wählen Sie "
 "anschließend <guimenuitem>In Chatraum einladen</guimenuitem>."
 
-#: C/group-conversations.page:102(p)
+#: C/group-conversations.page:102(item/p)
 msgid ""
 "Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</"
 "gui></guiseq>."
@@ -1971,29 +1891,29 @@ msgstr ""
 "Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Kontakt</gui><gui>In Chatraum "
 "einladen</gui></guiseq>."
 
-#: C/group-conversations.page:107(p)
+#: C/group-conversations.page:107(item/p)
 msgid ""
-"If you have more than one group conversation open, select the one you want to "
-"invite your contacts."
+"If you have more than one group conversation open, select the one you want "
+"to invite your contacts."
 msgstr ""
 "Falls Sie mehrere Gruppenunterhaltung geöffnet haben, wählen Sie diejenige "
 "aus, in welche Sie Ihre Kontakte einladen wollen."
 
-#: C/group-conversations.page:118(title)
+#: C/group-conversations.page:118(section/title)
 msgid "Join a group conversation"
 msgstr "Einer Gruppenunterhaltung beitreten"
 
-#: C/group-conversations.page:128(p)
+#: C/group-conversations.page:128(item/p)
 msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
 msgstr ""
-"Klappen Sie den Abschnitt <gui>Raumliste</gui> aus, um alle vorhandenen Räume "
-"anzuzeigen."
+"Klappen Sie den Abschnitt <gui>Raumliste</gui> aus, um alle vorhandenen "
+"Räume anzuzeigen."
 
-#: C/group-conversations.page:133(p)
+#: C/group-conversations.page:133(item/p)
 msgid "Double-click on the name of a room to join it."
 msgstr "Klicken Sie doppelt auf den Namen eines Raums, um ihn zu betreten."
 
-#: C/group-conversations.page:139(p)
+#: C/group-conversations.page:139(section/p)
 msgid ""
 "It is not possible to join all existing rooms. Some of the rooms might "
 "require a password, or might be invitation only. <app>Empathy</app> does not "
@@ -2003,1537 +1923,1633 @@ msgstr ""
 "dürften ein Passwort wiederum können nur aufgrund einer Einladung betreten "
 "werden. <app>Empathy</app> unterstützt diese Art von Räumen nicht."
 
-#: C/geolocation-what-is.page:9(desc)
-msgid "Understanding geolocation."
-msgstr "Erläuterungen zu Geoposition"
+#: C/hide-contacts.page:8(info/desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr "Verbergen von abgemeldeten Kontakten in Ihrer <gui>Kontaktliste</gui>."
 
-#: C/geolocation-what-is.page:33(title)
-msgid "What is geolocation"
-msgstr "Was ist die Geoposition?"
+#: C/hide-contacts.page:19(page/title)
+msgid "Hide offline contacts"
+msgstr "Abgemeldete Kontakte verbergen"
 
-#: C/geolocation-what-is.page:35(p)
+#: C/hide-contacts.page:21(page/p)
 msgid ""
-"Geolocation allows you to identify the real geographical location of a "
-"computer or a device connected to the Internet."
+"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
+"with which you can have a conversation, and also those that are offline."
 msgstr ""
-"Geoposition ermöglicht Ihnen die Ermittlung des wirklichen geografischen "
-"Ortes eines Rechners oder anderen Gerätes, welches mit dem Internet verbunden "
-"ist."
-
-#: C/geolocation-what-is.page:37(p)
-msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr "Mit der Geoposition in <app>Empathy</app> können Sie:"
+"Normalerweise zeigt <app>Empathy</app> alle Kontakte an: die angemeldeten "
+"Kontakte, mit denen Sie eine Unterhaltung führen können, und diejenigen "
+"Kontakte, die abgemeldet sind."
 
-#: C/geolocation-what-is.page:42(p)
-msgid "Publish your geographical location to your contacts."
-msgstr "Ihren Kontakten Ihre geografische Position anzeigen."
+#: C/hide-contacts.page:25(page/p)
+msgid "To hide the contacts that are offline:"
+msgstr "So verbergen Sie abgemeldete Kontakte:"
 
-#: C/geolocation-what-is.page:47(p)
-msgid "See your contacts’ geographical location and quickly contact them."
+#: C/hide-contacts.page:31(item/p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui> "
+"<gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</key> "
+"<key>H</key></keyseq>."
 msgstr ""
-"Die geografische Position Ihrer Kontakte sehen und direkt eine Verbindung "
-"herstellen."
+"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Ansicht</gui> "
+"<gui>Abgemeldete Kontakte</gui></guiseq> oder drücken Sie <keyseq><key>Strg</"
+"key> <key>H</key></keyseq>."
 
-#: C/geolocation-what-is.page:52(p)
-msgid ""
-"Set the accuracy of your location and the device used to discover your "
-"location."
+#: C/hide-contacts.page:36(item/p)
+msgid "To show the offline contacts again, repeat the same procedure above."
 msgstr ""
-"Die Genauigkeit Ihrer Position und das für die Ermittlung der Position "
-"verwendete Gerät sehen."
+"Um die abgemeldeten Kontakte wieder anzuzeigen, wiederholen Sie den oben "
+"beschriebenen Vorgang."
 
-#: C/geolocation-what-is.page:60(p)
-msgid ""
-"In order to see your contacts’ geographical locations, they need to use a "
-"service and an application that supports geolocation."
+#: C/import-account.page:10(info/desc)
+msgid "Import an account from another instant messaging application."
 msgstr ""
-"Um die geografische Position Ihrer Kontakte sehen zu können, müssen diese "
-"einen Dienst und eine Anwendung verwenden, die die Geoposition unterstützt."
+"Importieren eines Kontos aus einer anderen Sofortnachrichten-Anwendung."
 
-#: C/geolocation-turn.page:9(desc)
-msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr "Aktivierung und Deaktivierung der Geoposition in <app>Empathy</app>."
+#: C/import-account.page:19(credit/name)
+msgid "Peter Haslam"
+msgstr "Peter Haslam"
 
-#: C/geolocation-turn.page:33(title)
-msgid "Activate/Deactivate geolocation"
-msgstr "Aktivieren oder Deaktivieren der Geolokation"
+#: C/import-account.page:42(page/title)
+msgid "Import an existing account"
+msgstr "Importieren eines vorhandenen Kontos"
 
-#: C/geolocation-turn.page:37(p)
-msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+#: C/import-account.page:44(page/p)
+msgid ""
+"The first time you run <app>Empathy</app>, it will offer to import your "
+"accounts from other instant messaging applications. Currently, the only "
+"supported application is <app>Pidgin</app>."
 msgstr ""
-"Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui></guiseq>."
+"Wenn Sie <app>Empathy</app> zum ersten Mal starten, wird Ihnen der Import "
+"von Konten aus anderen Sofortnachrichten-Anwendungen angeboten. Gegenwärtig "
+"wird als einzige Anwendung <app>Pidgin</app> unterstützt."
 
-#: C/geolocation-turn.page:42(p)
-msgid "Select the <gui>Location</gui> tab."
-msgstr "Wählen Sie den Reiter <gui>Ort</gui>."
+#: C/import-account.page:50(item/p)
+msgid ""
+"Run <app>Empathy</app> for the first time. An assistant will offer you a "
+"number of options to create new accounts."
+msgstr ""
+"Wenn Sie <app>Empathy</app> zum ersten Mal ausführen, dann bietet Ihnen ein "
+"Assistent eine Reihe von Optionen zum Anlegen neuer Konten an."
 
-#: C/geolocation-turn.page:47(p)
+#: C/import-account.page:54(item/p)
 msgid ""
-"Select <gui>Publish location to my contacts</gui> to activate geolocation."
+"Select <gui>Yes, import my account details from</gui> and click "
+"<gui>Forward</gui>."
 msgstr ""
-"Wählen Sie <gui>Position an meine Kontakte übermitteln</gui>, um Geoposition "
-"zu aktivieren."
+"Wählen Sie <gui>Ja, meine Kontodetails importieren von</gui> und klicken Sie "
+"auf <gui>Weiter</gui>."
 
-#: C/geolocation-turn.page:50(p)
-msgid "To deactivate geolocation, deselect it."
-msgstr "Um Geoposition abzuschalten, deaktivieren Sie dies."
+#: C/import-account.page:58(item/p)
+msgid "Select the check box next to each account you wish to import."
+msgstr ""
+"Aktivieren Sie das Ankreuzfeld neben jedem Konto, das Sie importieren wollen."
 
-#: C/geolocation-turn.page:55(p)
+#: C/import-account.page:66(note/p)
 msgid ""
-"To increase the accuracy of your position, deselect <gui>Reduce location "
-"accuracy</gui>."
+"It is not currently possible to import accounts after you have completed the "
+"first-run assistant."
 msgstr ""
-"Um die Genauigkeit Ihrer Position zu erhöhen, deaktivieren Sie "
-"<gui>Positionsgenauigkeit verringern</gui>."
+"Gegenwärtig ist es nicht möglich, Konten zu importieren, nachdem der "
+"Einrichtungsassistent abgeschlossen ist."
 
-#: C/geolocation-turn.page:61(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/introduction.page:41(media)
+msgctxt "_"
 msgid ""
-"If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <gui>Location sources</gui> "
-"section."
-msgstr ""
-"Falls Sie über ein externes Gerät verfügen, z.B. GPS, oder eine genauere "
-"Position senden wollen, wählen Sie die entsprechende Option im Abschnitt "
-"<gui>Positionsquellen</gui>."
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
+msgstr "ok"
 
-#: C/geolocation-supported.page:7(desc)
-msgid "Services that supports geolocation and compatibility."
-msgstr "Dienste, die Geoposition und Kompatibilität unterstützen."
+#: C/introduction.page:9(info/desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "Einführung in den <app>Empathy</app>-Sofortnachrichtendienst."
 
-#: C/geolocation-supported.page:31(title)
-msgid "Supported services"
-msgstr "Unterstützte Dienste"
+#: C/introduction.page:21(page/title)
+msgid "Introduction"
+msgstr "Einführung"
 
-#: C/geolocation-supported.page:33(p)
+#: C/introduction.page:23(page/p)
 msgid ""
-"The geolocation feature at the moment is compatible only with the Jabber "
-"service. In order to use it, you and your contacts need to have a Jabber "
-"account."
+"<app>Empathy</app> is an instant messaging application for the GNOME "
+"Desktop. It supports text messaging, voice &amp; video calls, file "
+"transfers, and all the most used messaging systems such as MSN and Google "
+"Talk."
 msgstr ""
-"Gegenwärtig ist das Geolokation-Funktionsmerkmal ausschließlich mit dem "
-"Jabber-Dienst kompatibel. Um es nutzen zu können, müssen Sie und Ihre "
-"Kontakte über ein Jabber-Konto verfügen."
+"<app>Empathy</app> ist eine Sofortnachrichten-Anwendung für die GNOME-"
+"Arbeitsumgebung. Textnachrichten, Sprach- und Videoanrufe, "
+"Dateiübertragungen sowie alle gängigen Nachrichtensysteme wie MSN und "
+"GoogleTalk werden unterstützt."
 
-#: C/geolocation-supported.page:39(p)
+#: C/introduction.page:28(page/p)
 msgid ""
-"It is necessary that also the server you are using supports the geolocation "
-"feature. Most of the Jabber servers support it. See your service website "
-"documentation for more information."
+"<app>Empathy</app> includes features that help you better collaborate while "
+"at work, and that let you easily keep in touch with your friends."
 msgstr ""
-"Es ist notwendig, dass auch der von Ihnen verwendete Server das Geoposition-"
-"Funktionsmerkmal unterstützt. Die meisten Jabber-Server tun dies. Weitere "
-"Informationen finden Sie auf der Webseite Ihres Dienstes."
-
-#: C/geolocation-supported.page:47(title)
-msgid "Compatibility"
-msgstr "Kompatibilität"
+"<app>Empathy</app> bietet Funktionsmerkmale, die Ihnen einerseits die "
+"berufliche Zusammenarbeit erleichtern, aber es auch ermöglichen, mit Ihren "
+"Freunden in Verbindung zu bleiben."
 
-#: C/geolocation-supported.page:49(p)
+#: C/introduction.page:32(page/p)
 msgid ""
-"<app>Empathy</app> geolocation feature is not compatible with other "
-"geographical position services such as <em>Google Latitude</em>, <em>Yahoo "
-"Fire Eagle</em> or <em>Brightkite</em>."
+"Using <app>Empathy</app>, you can group all the conversations in a single "
+"window, have multiple windows for different kind of conversations, easily "
+"search through your previous conversations, and share your desktop in just "
+"two clicks."
 msgstr ""
-"Das Geoposition-Funktionsmerkmal von <app>Empathy</app> ist nicht kompatibel "
-"mit anderen geografischen Ortungsdiensten wie <em>Google Latitude</em>, "
-"<em>Yahoo Fire Eagle</em> oder <em>Brightkite</em>."
+"In <app>Empathy</app> können Sie alle Unterhaltungen in einem einzigen "
+"Fenster anordnen oder mehrere Fenster für die verschiedenen Arten von "
+"Unterhaltungen verwenden, frühere Unterhaltungen durchsuchen und Ihre "
+"Arbeitsumgebung mit nur zwei Klicks freigeben."
 
-#: C/geolocation-privacy.page:8(desc)
-msgid "What information are sent and to who."
-msgstr "Welche Informationen gesendet werden und an wen."
+#: C/introduction.page:39(figure/title)
+msgid "<gui>Contact List</gui> window"
+msgstr "<gui>Kontaktlisten</gui>-Fenster"
 
-#: C/geolocation-privacy.page:32(title)
-msgid "Geolocation Privacy"
-msgstr "Datenschutz bei Geoposition"
+#: C/introduction.page:40(figure/desc)
+msgid "<app>Empathy</app> main window"
+msgstr "<app>Empathy</app>-Hauptfenster"
 
-#: C/geolocation-privacy.page:35(title)
-msgid "What information is sent"
-msgstr "Gesendete Informationen"
+#: C/introduction.page:42(media/p)
+msgid "<app>Empathy</app> main window."
+msgstr "<app>Empathy</app>-Hauptfenster."
 
-#: C/geolocation-privacy.page:36(p)
-msgid ""
-"What is possible to send is: your country, region, locality, area, street, "
-"building, floor, room, and postal code, longitude, latitude and altitude, "
-"speed and bearing."
-msgstr ""
-"Gesendet werden können: Ihr Land, Bundesland, Ort, Bereich, Straße, Gebäude, "
-"Etage und Raum sowie Ihre Postleitzahl, der Längengrad, der Breitengrad, die "
-"Höhe über dem Meeresspiegel, die Geschwindigkeit die Funkpeilung."
+#: C/irc-commands.page:7(info/desc)
+msgid "The supported IRC commands."
+msgstr "Die unterstützten IRC-Befehle."
+
+#: C/irc-commands.page:18(page/title)
+msgid "Supported IRC commands"
+msgstr "Unterstützte IRC-Befehle"
 
-#: C/geolocation-privacy.page:40(p)
+#: C/irc-commands.page:19(page/p)
 msgid ""
-"The accuracy and the quantity of information about your geographical position "
-"are based on the software or on the infrastructure used to discover your "
-"position."
+"To see the list of the supported IRC commands, in a chat room type <input>/"
+"help</input> and press <key>Enter</key>."
 msgstr ""
-"Die Genauigkeit und die Menge der verfügbaren Informationen über Ihre "
-"geografische Position hängen von der Software oder der Infrastruktur ab, die "
-"für die Ermittlung Ihrer Position zum Einsatz kommt."
+"Um eine Liste der unterstützten IRC-Befehle in einem Unterhaltungsraum zu "
+"sehen, geben Sie <input>/help</input> ein und drücken Sie die "
+"<key>Eingabetaste</key>."
 
-#: C/geolocation-privacy.page:44(p)
+#: C/irc-commands.page:24(note/p)
+msgid "All commands available have a small description on their usage."
+msgstr "Alle Befehle verfügen über eine Kurzbeschreibung der Benutzung."
+
+#: C/irc-join-pwd.page:9(info/desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Betreten von passwortgeschützten Räumen im IRC"
+
+#: C/irc-join-pwd.page:25(page/title)
+msgid "Join a protected IRC chat room"
+msgstr "Betreten eines passwortgeschützten Raumes im IRC"
+
+#: C/irc-join-pwd.page:27(page/p)
 msgid ""
-"Different kind of networks may have different accuracy settings, and may send "
-"different information. The use of external devices such as GPS or mobile "
-"phone will increase the accuracy of the information sent."
+"On some IRC networks, private IRC rooms may be protected with a password. If "
+"you know the password, use the following steps to join:"
 msgstr ""
-"Verschiedene Arten von Netzwerken haben unterschiedliche "
-"Genauigkeitseinstellungen und senden daher verschiedene Informationen. Die "
-"Benutzung externer Geräte wie GPS oder Mobiltelefone erhöht die Genauigkeit "
-"der gesendeten Informationen."
+"In einigen IRC-Netzwerken können private IRC-Räume durch ein Passwort "
+"geschützt sein. Falls Sie das Passwort kennen, gehen Sie wie folgt vor, um "
+"den Raum zu betreten:"
 
-#: C/geolocation-privacy.page:49(p)
+#: C/irc-join-pwd.page:33(item/p)
+msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
+msgstr "<link xref=\"irc-join-room\">Betreten Sie den Raum</link> wie gewohnt."
+
+#: C/irc-join-pwd.page:38(item/p)
 msgid ""
-"When the privacy mode is enabled, nothing more precise than your city will be "
-"sent, even if you are using an external device."
+"Empathy will prompt you for a password. Enter the password for the IRC chat "
+"room and click <gui style=\"button\">Join</gui>."
 msgstr ""
-"Wenn der Privatsphäre-Modus aktiviert ist, wird nichts Genaueres als "
-"lediglich Angaben über die Stadt gesendet, in der Sie sich befinden, selbst "
-"dann, wenn Sie ein externes Gerät verwenden."
+"<app>Empathy</app> wird Sie nach einem Passwort fragen. Geben Sie das "
+"Passwort für den IRC-Raum ein und klicken Sie auf <gui style=\"button"
+"\">Beitreten</gui>."
 
-#: C/geolocation-privacy.page:56(title)
-msgid "Who can see the information sent"
-msgstr "Wer die gesendeten Informationen sehen kann"
+#: C/irc-join-room.page:8(info/desc)
+msgid "Join an IRC channel."
+msgstr "Betreten eines IRC-Kanals."
 
-#: C/geolocation-privacy.page:57(p)
-msgid "Only your contacts can see your geographical position."
-msgstr "Nur Ihre Kontakte können Ihre geografische Position sehen."
+#: C/irc-join-room.page:31(page/title)
+msgid "Join an IRC chat room"
+msgstr "Betreten eines IRC-Unterhaltungsraumes"
 
-#: C/geolocation-privacy.page:63(title)
-msgid "What is the privacy mode"
-msgstr "Datenschutzmodus"
+#: C/irc-join-room.page:33(page/p)
+msgid ""
+"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
+"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
+"account\"/> and <link xref=\"account-irc\"/>."
+msgstr ""
+"Sie können IRC-Unterhaltungsräume (auch als IRC-Kanäle bekannt) in jedem IRC-"
+"Netzwerk betreten, mit dem Sie verbunden sind. Weitere Informationen hierzu "
+"finden Sie in <link xref=\"add-account\"/> und <link xref=\"account-irc\"/>."
 
-#: C/geolocation-privacy.page:64(p)
+#: C/irc-join-room.page:45(item/p)
 msgid ""
-"The privacy mode, enabled by default, is a reduced accuracy mode that will "
-"decrease the accuracy of the geographical position sent to your contacts."
+"From the <gui>Account</gui> drop-down list, select the IRC account that "
+"corresponds to the network you want to use."
 msgstr ""
-"Der per Vorgabe aktivierte Privatsphäre-Modus ist ein Modus mit verminderter "
-"Genauigkeit. Die Genauigkeit der zu Ihren Kontakten gesendeten geografischen "
-"Position wird dabei verringert."
+"Aus der <gui>Konto</gui>-Auswahlliste wählen Sie das IRC-Konto, das zu dem "
+"Netzwerk gehört, welches Sie verwenden wollen."
 
-#: C/geolocation-privacy.page:71(title)
-msgid "Privacy overview"
-msgstr "Datenschutz-Ãœberblick"
+#: C/irc-join-room.page:51(item/p)
+msgid ""
+"In the <gui>Room</gui> text box, type the name of the channel you want to "
+"join. IRC channel names start with the hash character (<sys>#</sys>)."
+msgstr ""
+"Geben Sie in das <guilabel>Raum</guilabel>-Textfeld den Namen des Channels "
+"ein, den Sie betreten wollen. Die Namen der IRC-Kanäle beginnen mit einem "
+"Raute-Zeichen (<sys>#</sys>)."
+
+#: C/irc-join-room.page:57(item/p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "Klicken Sie auf <gui>Betreten</gui>, um den Raum zu betreten."
 
-#: C/geolocation-privacy.page:72(p)
+#: C/irc-join-room.page:64(note/p)
 msgid ""
-"Overview of the various geolocation privacy settings in <app>Empathy</app>."
+"To join multiple rooms, you need to repeat the steps above for each room."
 msgstr ""
-"Überblick über die verschiedenen Privatsphäre-Einstellungen für die "
-"Geoposition in <app>Empathy</app>."
+"Um mehrere Räume zu betreten, müssen Sie die oben genannten Schritte für "
+"jeden Raum wiederholen."
 
-#: C/geolocation-privacy.page:77(p)
-msgid "Geolocation is not enabled by default."
-msgstr "Geoposition ist per Vorgabe nicht aktiviert."
+#: C/irc-manage.page:9(info/desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "Benutzung des IRC mit <app>Empathy</app>."
 
-#: C/geolocation-privacy.page:82(p)
-msgid "Privacy mode is enabled by default."
-msgstr "Der Datenschutzmodus ist per Vorgabe aktiviert."
+#: C/irc-manage.page:34(page/title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
 
-#: C/geolocation-privacy.page:87(p)
-msgid "Privacy mode prevails even when using external and more precise devices."
+#: C/irc-manage.page:41(when/p)
+msgid ""
+"<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button"
+"\">Install telepathy-idle</link>"
 msgstr ""
-"Der Privatsphäre-Modus ist auch dann wirksam, wenn externe und genauere "
-"Geräte benutzt werden."
+"<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button"
+"\">telepathy-idle installieren</link>"
 
-#: C/geolocation-privacy.page:92(p)
-msgid "Only your contacts can see your position."
-msgstr "Nur Ihre Kontakte können Ihre Position sehen."
+#: C/irc-manage.page:48(info/title)
+msgctxt "link"
+msgid "IRC Chat Rooms and Conversations"
+msgstr "IRC-Räume und Unterhaltungen"
 
-#: C/geolocation-not-showing.page:8(desc)
-msgid "<app>Empathy</app> does not publish my geographical position."
-msgstr "<app>Empathy</app> übermittelt meine geografische Position nicht."
+#: C/irc-manage.page:50(section/title)
+msgid "Chat Rooms and Conversations"
+msgstr "Unterhaltungsräume und Unterhaltungen"
 
-#: C/geolocation-not-showing.page:32(title)
-msgid "Geographical position not published"
-msgstr "Geografische Position wird nicht veröffentlicht"
+#: C/irc-manage.page:55(info/title)
+msgctxt "link"
+msgid "Common IRC Problems"
+msgstr "Häufige Probleme im IRC"
 
-#: C/geolocation-not-showing.page:34(p)
-msgid ""
-"If your contacts cannot see your location, <app>Empathy</app> might not be "
-"able to discover with a good margin of precision your geographical position."
+#: C/irc-nick-password.page:10(info/desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
 msgstr ""
-"Falls Ihre Kontakte Ihren Ort nicht sehen können, dann ist <app>Empathy</app> "
-"möglicherweise nicht in der Lage, Ihren Ort mit einer hinreichenden "
-"Genauigkeit zu bestimmen."
+"Schützen Sie Ihren Spitznamen, um zu verhindern, dass andere IRC-Benutzer "
+"ihn verwenden."
+
+#: C/irc-nick-password.page:33(page/title)
+msgid "Use a nickname password on IRC"
+msgstr "Verwenden eines Passworts für einen Spitznamen im IRC"
 
-#: C/geolocation-not-showing.page:38(p)
+#: C/irc-nick-password.page:35(page/p)
 msgid ""
-"In this case, your position will not be published, but you are still able to "
-"see the location of your contacts."
+"On some IRC networks, you can register your nickname with a service called "
+"NickServ. By sending special messages to NickServ, you can set your password "
+"and identify yourself. Some IRC chat rooms may not allow you to join without "
+"a registered nickname."
 msgstr ""
-"In diesem Fall wird Ihre Position nicht übermittelt, aber Sie sind weiterhin "
-"in der Lage, die Position Ihrer Kontakte zu sehen."
+"In einigen IRC-Netzwerken können Sie Ihren Spitznamen mittels eines Dienstes "
+"namens NickServ registrieren. Durch spezielle Meldungen an NickServ können "
+"Sie Ihr Passwort festlegen und sich selbst identifizieren. Manche IRC-"
+"Unterhaltungsräume können Sie ohne einen registrierten Spitznamen nicht "
+"betreten."
 
-#: C/geolocation-not-showing.page:42(p)
+#: C/irc-nick-password.page:40(page/p)
 msgid ""
-"If you want to publish your geographical position, you can try to use an "
-"external device such as a GPS."
+"<app>Empathy</app> does not currently support nickname registration. Some "
+"IRC networks, however, will automatically forward a <em>server password</em> "
+"to NickServ. On these networks, you can use the IRC password in "
+"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
+"network is known to have this feature."
 msgstr ""
-"Zum Übermitteln Ihrer geografischen Position können Sie ein externes Gerät "
-"verwenden, wie beispielsweise ein GPS-Gerät."
+"<app>Empathy</app> unterstützt gegenwärtig die Registrierung von Spitznamen "
+"nicht. Einige IRC-Netzwerke leiten jedoch automatisch ein "
+"<em>Serverpasswort</em> an NickServ weiter. In diesen Netzwerken können Sie "
+"das IRC-Passwort in <app>Empathy</app> verwenden, um sich bei NickServ zu "
+"identifizieren. Das populäre FreeNode-Netzwerk verfügt bekanntermaßen über "
+"dieses Funktionsmerkmal."
 
-#: C/geolocation-not-showing.page:48(p)
-msgid ""
-"In order to publish your geographical location, your Jabber server needs to "
-"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
-"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support PEP</"
-"link> is maintained online. Google Talk does not support this feature at this "
-"time."
+#: C/irc-nick-password.page:46(page/p)
+msgid "To set an IRC server password:"
+msgstr "So legen Sie ein IRC-Serverpasswort fest:"
+
+#: C/irc-nick-password.page:54(item/p)
+msgid "Select the IRC account from the list on the left of the dialog."
 msgstr ""
-"Um Ihre geografische Position übermitteln zu können, muss Ihr Jabber-Server "
-"das »Personal Eventing Protocol« (PEP) unterstützen. Eine Liste von <link "
-"href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">Servern mit "
-"PEP-Unterstützung</link> wird im Internet gepflegt. Google Talk unterstützt "
-"dieses Funktionsmerkmal derzeit nicht."
+"Wählen Sie das IRC-Konto aus der Liste an der linken Seite des Dialogs aus."
 
-#: C/geolocation.page:8(desc)
-msgid "Use and understand geolocation in <app>Empathy</app>."
-msgstr "Benutzung von und Erläuterungen zur Geoposition in <gui>Empathy</gui>."
+#: C/irc-nick-password.page:57(item/p)
+msgid ""
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
+msgstr ""
+"Geben Sie im Textfeld <gui>Passwort</gui> das Passwort ein, dass Sie bei der "
+"Registrierung Ihres Spitznamens verwendet haben."
 
-#: C/geolocation.page:32(title)
-msgid "Geographical position"
-msgstr "Die geografische Position"
+#: C/irc-nick-password.page:69(note/p)
+msgid ""
+"These instructions only allow you to use a password-protected nickname on "
+"certain IRC networks. It is not currently possible to register an IRC "
+"nickname or change your nickname password using <app>Empathy</app>."
+msgstr ""
+"Diese Anweisungen erlauben Ihnen lediglich die Verwendung eines "
+"passwortgeschützten Spitznamens in verschiedenen IRC-Netzwerken. Es ist "
+"gegenwärtig nicht möglich, mit <app>Empathy</app> einen IRC-Spitznamen zu "
+"registrieren oder das Passwort für Ihren Spitznamen zu ändern."
 
-#: C/geolocation.page:35(title)
-msgid "Geolocation"
-msgstr "Geoposition"
+#: C/irc-send-file.page:9(info/desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr ""
+"Derzeit ist es nicht möglich, mit <app>Empathy</app> Dateien im IRC zu "
+"versenden."
 
-#: C/geolocation.page:39(title)
-msgid "Fix common problems"
-msgstr "Behebung häufig auftretender Probleme"
+#: C/irc-send-file.page:31(page/title)
+msgid "Send files over IRC"
+msgstr "Dateien im IRC senden"
 
-#: C/favorite-rooms.page:10(desc)
-msgid "Set, join and manage favorite rooms."
-msgstr "Einrichten, Betreten und Verwalten bevorzugter Räume."
+#: C/irc-send-file.page:33(page/p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "Derzeit ist es nicht möglich, Dateien im IRC zu versenden."
 
-#: C/favorite-rooms.page:29(title)
-msgid "Favorite rooms"
-msgstr "Bevorzugte Räume"
+#: C/irc-start-conversation.page:8(info/desc)
+msgid "Start a conversation with an IRC contact."
+msgstr "Eine Unterhaltung mit einem IRC-Kontakt starten."
 
-#: C/favorite-rooms.page:32(title)
-msgid "Set a room as a favorite"
-msgstr "Einen Raum als bevorzugt einrichten"
+#: C/irc-start-conversation.page:30(page/title)
+msgid "Chat with somebody on IRC"
+msgstr "Eine Unterhaltung mit jemandem im IRC führen"
 
-#: C/favorite-rooms.page:35(p)
-msgid "Join a room."
-msgstr "Betreten eines Raumes."
+#: C/irc-start-conversation.page:32(page/p)
+msgid ""
+"You can hold private conversations with other IRC users, outside of the "
+"public IRC chat rooms. To start a conversation with another IRC user:"
+msgstr ""
+"Sie können private Unterhaltungen mit anderen IRC-Benutzern außerhalb der "
+"öffentlichen IRC-Unterhaltungsräume führen. So beginnen Sie eine "
+"Unterhaltung mit einem anderen IRC-Benutzer:"
 
-#: C/favorite-rooms.page:40(p)
+#: C/irc-start-conversation.page:37(item/p)
 msgid ""
-"See <link xref=\"irc-join-room\"/> for more information on how to join an IRC "
-"room."
+"In the contact list for an IRC chat room, double click the name of the user "
+"you want to chat with. Alternatively, right click the name of the user and "
+"choose <gui>Chat</gui>."
 msgstr ""
-"In <link xref=\"irc-join-room\"/> finden Sie weitere Informationen über das "
-"Betreten eines Raumes im IRC."
+"Klicken Sie doppelt in der Kontaktliste für einen IRC-Unterhaltungsraum auf "
+"den Namen des Benutzers, mit dem Sie eine Unterhaltung führen wollen. "
+"Alternativ klicken Sie mit der rechten Maustaste auf den Spitznamen des "
+"Benutzers und wählen <gui>Unterhaltung</gui>."
 
-#: C/favorite-rooms.page:46(p)
+#: C/irc-start-conversation.page:45(item/p)
 msgid ""
-"See <link xref=\"group-conversations\"/> for more information on how to start "
-"or join a group conversation."
+"The IRC room contact list is not the same as <app>Empathy</app> contact "
+"list. It contains a list of users in the IRC chat room you joined. Different "
+"rooms can have different contacts listed."
 msgstr ""
-"In <link xref=\"group-conversations\"/> finden Sie weitere Informationen über "
-"das Starten oder Teilnehmen an einer Gruppenunterhaltung."
+"Die Kontaktliste in IRC-Unterhaltungsräumen ist nicht mit der Kontaktliste "
+"in <app>Empathy</app> vergleichbar. Sie enthält eine Liste von Benutzern des "
+"Raumes, den Sie betreten haben. Verschiedene Räume können unterschiedliche "
+"Kontaktlisten haben."
 
-#: C/favorite-rooms.page:54(p)
+#: C/irc-start-conversation.page:52(item/p)
 msgid ""
-"From the conversation window, choose <guiseq><gui>Conversation</"
-"gui><gui>Favorite Chat Room</gui></guiseq>."
+"The IRC room contact list is usually on the right side of the IRC room "
+"window. If you do not see it, choose <guiseq><gui>Conversation</"
+"gui><gui>Show Contact List</gui></guiseq>."
 msgstr ""
-"Wählen Sie im Unterhaltungsfenster <guiseq><gui>Unterhaltung</"
-"gui><gui>Favorisierter Chatraum</gui></guiseq>."
+"Die Kontaktliste des IRC-Raumes befindet sich üblicherweise an der rechten "
+"Seite des IRC-Fensters. Falls sie nicht angezeigt wird, wählen Sie "
+"<guiseq><gui>Unterhaltung</gui><gui>Kontaktliste anzeigen</gui></guiseq>."
 
-#: C/favorite-rooms.page:63(title)
-msgid "Join favorite rooms"
-msgstr "Betreten bevorzugter Räume"
+#: C/license.page:8(info/desc)
+msgid "Legal information."
+msgstr "Rechtliche Hinweise."
 
-#: C/favorite-rooms.page:71(p)
-msgid "Press <key>F5</key>."
-msgstr "Drücken Sie <key>F5</key>."
+#: C/license.page:11(page/title)
+msgid "License"
+msgstr "Lizenz"
 
-#: C/favorite-rooms.page:76(p)
+#: C/license.page:12(page/p)
 msgid ""
-"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join all "
-"your favorite rooms."
+"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license."
 msgstr ""
-"Wählen Sie <guiseq><gui>Raum</gui><gui>Favoriten betreten</gui></guiseq>, um "
-"alle Ihre bevorzugten Räume zu betreten."
+"Dieses Werk wird unter einer »CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license« verbreitet."
 
-#: C/favorite-rooms.page:82(p)
-msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
+#: C/license.page:20(page/p)
+msgid "You are free:"
+msgstr "Es ist Ihnen gestattet:"
+
+#: C/license.page:25(item/title)
+msgid "<em>To share</em>"
+msgstr "<em>Freizugeben</em>"
+
+#: C/license.page:26(item/p)
+msgid "To copy, distribute and transmit the work."
 msgstr ""
-"Wählen Sie <gui>Raum</gui>, und wählen Sie den bevorzugten Raum aus, den Sie "
-"betreten wollen."
+"Das Werk bzw. den Inhalt zu vervielfältigen, zu verbreiten und öffentlich "
+"zugänglich zu machen."
+
+#: C/license.page:29(item/title)
+msgid "<em>To remix</em>"
+msgstr "<em>Änderungen vorzunehmen</em>"
+
+#: C/license.page:30(item/p)
+msgid "To adapt the work."
+msgstr "Abwandlungen und Bearbeitungen des Werkes bzw. Inhaltes anzufertigen."
 
-#: C/favorite-rooms.page:90(p)
+#: C/license.page:33(page/p)
+msgid "Under the following conditions:"
+msgstr "Unter den folgenden Bedingungen:"
+
+#: C/license.page:38(item/title)
+msgid "<em>Attribution</em>"
+msgstr "<em>Weitergabe</em>"
+
+#: C/license.page:39(item/p)
 msgid ""
-"To join a favorite room, you need to be connected to the Internet and to your "
-"account."
+"You must attribute the work in the manner specified by the author or "
+"licensor (but not in any way that suggests that they endorse you or your use "
+"of the work)."
 msgstr ""
-"Um einen bevorzugten Raum zu betreten, müssen Sie mit dem Internet und mit "
-"Ihrem Konto verbunden sein."
+"Sie dürfen das Werk nur unter gleichen Bedingungen weitergeben, wie Sie vom "
+"Autor oder Lizenzgeber festgelegt wurden (aber nicht so, dass es wie Ihr "
+"Werk aussieht)."
 
-#: C/favorite-rooms.page:98(title)
-msgid "Manage favorite rooms"
-msgstr "Raumfavoriten verwalten"
+#: C/license.page:46(item/title)
+msgid "<em>Share Alike</em>"
+msgstr "<em>Share Alike</em>"
 
-#: C/favorite-rooms.page:101(p)
+#: C/license.page:47(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Manage Favorites</gui></guiseq>."
+"If you alter, transform, or build upon this work, you may distribute the "
+"resulting work only under the same, similar or a compatible license."
 msgstr ""
-"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Raum</"
-"gui><gui>Favoriten verwalten</gui></guiseq>."
+"Wenn Sie das lizenzierte Werk bzw. den lizenzierten Inhalt bearbeiten, "
+"abwandeln oder in anderer Weise erkennbar als Grundlage für eigenes Schaffen "
+"verwenden, dürfen Sie die daraufhin neu entstandenen Werke bzw. Inhalte nur "
+"unter Verwendung von Lizenzbedingungen weitergeben, die mit denen dieses "
+"Lizenzvertrages identisch, vergleichbar oder kompatibel sind."
 
-#: C/favorite-rooms.page:107(p)
+#: C/license.page:53(page/p)
 msgid ""
-"From the <gui>Account</gui> drop-down list, select the account you want to "
-"manage the favorite rooms of."
+"For the full text of the license, see the <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
+"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
+"sa/3.0/\">Commons Deed</link>."
 msgstr ""
-"Aus der <guilabel>Konto</guilabel>-Aufklappliste wählen Sie das Konto, dessen "
-"bevorzugte Räume Sie verwalten wollen."
+"Den vollständigen Text der Lizenz finden sie auf der <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons-Webseite</"
+"link>. Oder Sie können den vollständigen <link href=\"http://creativecommons."
+"org/licenses/by-sa/3.0/\">Commons Deed</link> lesen."
 
-#: C/favorite-rooms.page:111(p)
-msgid "Select <gui>All</gui> to see all you favorite rooms."
-msgstr "Wählen Sie <gui>Alle</gui>, um alle Ihre bevorzugten Räume zu sehen."
+#: C/link-contacts.page:11(info/desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr ""
+"Verschiedene Kontakte in einen einzigen zusammenführen oder diese aufteilen."
 
-#: C/favorite-rooms.page:116(p)
-msgid "Select the favorite room you want to manage:"
-msgstr "Wählen Sie den bevorzugten Raum, den Sie verwalten wollen:"
+#: C/link-contacts.page:25(page/title)
+msgid "Combine and separate contacts"
+msgstr "Kontakte zusammenlegen und aufteilen"
 
-#: C/favorite-rooms.page:121(p)
+#: C/link-contacts.page:26(page/p)
 msgid ""
-"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
-"that room when you connect to your account."
+"If one, or more, of your contacts has multiple accounts with different "
+"messaging services, you can combine these contacts into a single one."
 msgstr ""
-"Aktivieren Sie das Ankreuzfeld <gui>Auto-Verbinden</gui>, um einen Raum immer "
-"dann automatisch zu betreten, wenn Sie sich an Ihrem Konto anmelden."
+"Wenn ein oder mehrere Kontakte verschiedene Konten bei unterschiedlichen "
+"Nachrichtendiensten haben, so können Sie diese Kontakte in einen einzigen "
+"zusammenlegen."
 
-#: C/favorite-rooms.page:127(p)
-msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+#: C/link-contacts.page:30(page/p)
+msgid ""
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
 msgstr ""
-"Klicken Sie auf <gui>Entfernen</gui>, um den Raum aus Ihren bevorzugten "
-"Räumen zu entfernen."
-
-#: C/favorite-rooms.page:134(p)
-msgid "When done, click <gui>Close</gui>."
-msgstr "Sobald Sie fertig sind, klicken Sie auf <gui>Schließen</gui>."
+"Der entstehende Kontakt wird als <em>Meta-Kontakt</em> bezeichnet: Ein "
+"Kontakt, der aus unterschiedlichen einzelnen Kontakten gebildet wird."
 
-#: C/disable-account.page:9(desc)
-msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+#: C/link-contacts.page:34(page/p)
+msgid ""
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
 msgstr ""
-"<app>Empathy</app> daran hindern, die Verbindung zu einem Konto automatisch "
-"herzustellen."
+"Wenn Sie einen Kontakt »Janina Schmitt« haben, der drei verschiedene "
+"Nachrichtendienste verwende, wie z.B.:"
 
-#: C/disable-account.page:39(title)
-msgid "Disable an account"
-msgstr "Deaktivieren eines Kontos"
+#: C/link-contacts.page:40(item/p)
+msgid "janes@facebook"
+msgstr "janinas@facebook"
+
+#: C/link-contacts.page:45(item/p)
+msgid "jane.smith@gmail"
+msgstr "Janina Schmitt@gmail"
+
+#: C/link-contacts.page:50(item/p)
+msgid "jane_smith@hotmail"
+msgstr "Janina_Schmitt@hotmail"
+
+#: C/link-contacts.page:55(page/p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "Dann können Sie diese Kontakte in einen einzigen zusammenlegen."
 
-#: C/disable-account.page:41(p)
+#: C/link-contacts.page:60(section/title)
+msgid "Combining contacts"
+msgstr "Kontakte zusammenlegen"
+
+#: C/link-contacts.page:63(item/p)
 msgid ""
-"You can disable an account to prevent <app>Empathy</app> from logging in to "
-"it without removing the account entirely. You may wish to disable and re-"
-"enable an account if you only want to be logged in to the account at certain "
-"times, but you still want to use <app>Empathy</app> for other accounts."
+"From the <gui>Contact List</gui> window, right-click one of the contact that "
+"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
+"gui>."
 msgstr ""
-"Sie können ein Konto deaktivieren, um zu verhindern, dass <app>Empathy</app> "
-"sich an diesem Konto anmeldet. Das Konto wird dabei nicht völlig entfernt. "
-"Vielleicht wollen Sie ein Konto deaktivieren und erneut aktivieren, wenn Sie "
-"nur zeitweise angemeldet sein wollen, aber <app>Empathy</app> noch für andere "
-"Konten nutzen wollen."
+"Klicken Sie mit der rechten Maustaste im Fenster <gui>Kontaktliste</gui> auf "
+"einen Kontakt, der verschiedene Konten verwendet, und wählen Sie <gui style="
+"\"menuitem\">Kontakte verknüpfen …</gui>."
 
-#: C/disable-account.page:52(p)
+#: C/link-contacts.page:70(item/p)
 msgid ""
-"Select the account you wish to disable from the accounts list on the left "
-"side of the window."
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
 msgstr ""
-"Wählen Sie das Konto, das Sie aus der Kontenliste entfernen wollen, an der "
-"linken Seite des Dialogs aus."
+"Wählen Sie in der linken Seitenleiste im Fenster <gui>Kontakte verknüpfen</"
+"gui> die Kontakte aus, die Sie zusammenlegen wollen."
 
-#: C/disable-account.page:56(p)
+#: C/link-contacts.page:76(item/p)
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Klicken Sie auf <gui style=\"button\">Verknüpfen</gui>."
+
+#: C/link-contacts.page:82(note/p)
 msgid ""
-"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
-"window."
+"When a meta-contact has been created, the default contact that will be used "
+"to have a conversation with when you double-click on it, is the contact with "
+"the highest presence on-line."
 msgstr ""
-"Entfernen Sie die Markierung von <gui style=\"checkbox\">Aktiviert</gui> an "
-"der rechten Seite des Fensters."
+"Wenn ein Meta-Kontakt erstellt wurde wird derjenige Kontakt bei einer "
+"Unterhaltung verwendet, der die längste Zeit angemeldet ist."
+
+#: C/link-contacts.page:91(section/title)
+msgid "Separating contacts"
+msgstr "Kontakte aufteilen"
 
-#: C/disable-account.page:62(p)
+#: C/link-contacts.page:94(item/p)
 msgid ""
-"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</gui>."
+"From the <gui>Contact List</gui>, right-click the contact to separate, and "
+"select <gui style=\"menuitem\">Link Contacts...</gui>."
 msgstr ""
-"Um das Konto erneut zu aktivieren, wählen Sie <gui style=\"checkbox"
-"\">Aktiviert</gui>."
+"Wählen Sie in der <gui>Kontakliste</gui> den Kontakt mit der rechten "
+"Maustaste aus, den Sie aufteilen möchten, und wählen Sie <gui style="
+"\"menuitem\">Kontakte verknüpfen …</gui>."
 
-#: C/create-account.page:9(desc)
-msgid "Register for an account with one of the supported messaging services."
-msgstr "Ein Konto bei einem der unterstützten Nachrichtendienste registrieren."
+#: C/link-contacts.page:100(item/p)
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Klicken Sie auf <gui style=\"button\">Verknüpfung aufheben</gui>."
 
-#: C/create-account.page:34(title)
-msgid "Register for a new account"
-msgstr "Ein neues Konto registrieren"
+#: C/prev-conv.page:8(info/desc)
+msgid "Browse or search your previous conversations."
+msgstr "Betrachten und Durchsuchen Ihrer früheren Unterhaltungen."
 
-#: C/create-account.page:36(p)
+#: C/prev-conv.page:36(page/title)
+msgid "View previous conversations"
+msgstr "Vorherige Unterhaltungen anschauen"
+
+#: C/prev-conv.page:38(page/p)
 msgid ""
-"Most account types require you to create an account with a account provider "
-"before you can connect using instant messaging applications like "
-"<app>Empathy</app>. With some account providers, you can use <app>Empathy</"
-"app> to register for a new account, using the same steps as you would to "
-"<link xref=\"add-account\">add an account</link>."
+"<app>Empathy</app> automatically saves all your text conversations you have "
+"with your contacts. You can <link xref=\"#search\">search through all of "
+"your previous conversations</link> or <link xref=\"#browse\">browse previous "
+"conversations</link> by contact and date."
 msgstr ""
-"Für die meisten Kontentypen ist es erforderlich, dass Sie ein Konto bei einem "
-"Dienstanbieter erstellen, bevor Sie sich über Sofortnachrichten-Anwendungen "
-"wie <gui>Empathy</gui> verbinden können. Für einige Kontenanbieter können Sie "
-"<gui>Empathy</gui> verwenden, um ein neues Konto zu registrieren, unter "
-"Anwendung der gleichen Schritte wie für das <link xref=\"add-account"
-"\">Hinzufügen eines Kontos</link>."
+"<app>Empathy</app> speichert automatisch alle Ihre Text-Unterhaltungen, die "
+"Sie mit Ihren Kontakten führen. Sie können <link xref=\"#search\">alle "
+"früheren Unterhaltungen durchsuchen</link> oder <link xref=\"#browse"
+"\">frühere Unterhaltungen anhand Kontakt und Datum suchen</link>."
 
-#: C/create-account.page:42(p)
+#: C/prev-conv.page:46(note/p)
 msgid ""
-"This page provides information on creating a new account for various types of "
-"accounts. Your account provider should give you a login ID and a password, as "
-"well as any additional information you need to connect using <app>Empathy</"
-"app>."
+"You do not need to be connected to the Internet to view and search your "
+"previous conversations."
 msgstr ""
-"Diese Seite stellt für die verschiedenen Kontentypen Informationen über das "
-"Anlegen eines neuen Kontos bereit. Sie sollten von Ihrem Dienstanbieter eine "
-"Anmeldekennung und ein Passwort sowie eventuelle zusätzliche Informationen "
-"erhalten haben, die Sie zum Verbinden mit <gui>Empathy</gui> benötigen."
+"Sie müssen nicht mit dem Internet verbunden sein, um Ihre vorherigen "
+"Unterhaltungen zu betrachten und zu durchsuchen."
 
-#: C/create-account.page:47(title)
-msgid "Facebook"
-msgstr "Facebook"
+#: C/prev-conv.page:53(section/title)
+msgid "Search previous conversations"
+msgstr "Vorherige Unterhaltungen durchsuchen"
 
-#: C/create-account.page:48(p)
+#: C/prev-conv.page:55(section/p)
 msgid ""
-"Facebook is one of the most-used social networks. It allows users to create "
-"their own profile and to communicate with their friends."
+"You can perform a full-text search through all of your previous "
+"conversations."
 msgstr ""
-"Facebook ist eines der am meisten genutzten sozialen Netzwerke. Den Benutzern "
-"wird die Erstellung eines eigenen Profils und die Kommunikation mit ihren "
-"Freunden ermöglicht."
+"Sie können den Volltext aller Ihrer vorherigen Unterhaltungen durchsuchen."
 
-#: C/create-account.page:52(p)
+#: C/prev-conv.page:59(item/p) C/prev-conv.page:87(item/p)
 msgid ""
-"To use Facebook to communicate with your friends, you will need to create a "
-"new account from the website: <link href=\"http://www.facebook.com\">www."
-"facebook.com</link>."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui> "
+"<gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</"
+"key>."
 msgstr ""
-"Um Facebook zur Unterhaltung mit Ihren Freunden nutzen zu können, müssen Sie "
-"ein neues Konto auf folgender Webseite erstellen: <link href=\"http://www."
-"facebook.com\">www.facebook.com</link>."
-
-#: C/create-account.page:60(title) C/audio-video.page:170(p)
-msgid "Jabber"
-msgstr "Jabber"
+"Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Ansicht</gui> "
+"<gui>Vorherige Unterhaltungen</gui></guiseq>. Alternativ drücken Sie "
+"<key>F3</key>."
 
-#: C/create-account.page:62(p)
+#: C/prev-conv.page:63(item/p)
 msgid ""
-"Jabber is an open instant messaging system. Like email, Jabber allows you to "
-"choose your account provider and communicate with all other Jabber users, "
-"regardless of their account provider."
+"Select an account from the drop-down list in the top. A list of contacts and "
+"chat room for that account will be shown below."
 msgstr ""
-"Jabber ist ein offenes Sofortnachrichtensystem. Wie E-Mail, erlaubt Jabber "
-"die Wahl Ihres Konto-Dienstanbieters und die Kommunikation mit anderen Jabber-"
-"Benutzern, unabhängig von deren Konto-Dienstanbietern."
+"Wählen Sie ein Konto in der Auswahlliste oben. Eine Liste der Kontakte und "
+"Unterhaltungsräume für dieses Konto wird darunter angezeigt."
 
-#: C/create-account.page:66(p)
+#: C/prev-conv.page:67(item/p)
 msgid ""
-"You will need to create a new account with a Jabber provider. There are many "
-"free providers; one popular provider is <link href=\"http://register.jabber."
-"org/\">Jabber.org</link>."
-msgstr ""
-"Es wird nötig sein, dass Sie ein neues Konto bei einem Jabber-Dienstanbieter "
-"anlegen. Es gibt zahlreiche freie Jabber-Dienstanbieter, einer der "
-"populärsten ist <link href=\"http://register.jabber.org/\">Jabber.org</link>."
+"Type the text you want to search for in the <gui>Search</gui> text field."
+msgstr "Geben Sie den zu suchenden Text im <gui>Suchfeld</gui> ein."
 
-#: C/create-account.page:71(p)
+#: C/prev-conv.page:71(item/p)
 msgid ""
-"If you use Google Mail or Google Talk, you already have a Jabber account. "
-"Google Talk is a Jabber service. Simply use your Google Mail address and "
-"password in <app>Empathy</app> to connect."
+"Any conversations that matched your search terms will be shown. By default, "
+"conversations are ordered by date."
 msgstr ""
-"Falls Sie Google Mail oder Google Talk benutzen, haben Sie bereits ein Jabber-"
-"Konto. Google Talk ist ein Jabber-Dienst. Verwenden Sie einfach Ihre Google "
-"Mail-Adresse und Ihr Passwort in <app>Empathy</app> für die Verbindung."
+"Jegliche Unterhaltungen, die auf Ihre Suchbegriffe zutreffen, werden in der "
+"Liste unterhalb des Suchfeldes angezeigt. Per Vorgabe sind die "
+"Unterhaltungen nach Datum geordnet."
 
-#: C/create-account.page:78(title) C/audio-video.page:190(p)
-msgid "People Nearby"
-msgstr "Personen in der Nähe"
+#: C/prev-conv.page:80(section/title)
+msgid "Browse previous conversations"
+msgstr "Vorherige Unterhaltungen betrachten"
 
-#: C/create-account.page:80(p)
+#: C/prev-conv.page:82(section/p)
 msgid ""
-"You do not need to create an account with a service provider to use this "
-"feature. This service works whenever you are connected to a local network, "
-"such as a wireless hotspot. It automatically finds all other users on the "
-"network who are also using this service."
+"You can browse your previous conversations with your contacts or in chat "
+"rooms by date."
 msgstr ""
-"Sie müssen kein Konto bei einem Dienstanbieter anlegen, um dieses "
-"Funktionsmerkmal nutzen zu können. Dieser Dienst ist immer dann verfügbar, "
-"wenn Sie mit einem lokalen Netzwerk verbunden sind, zum Beispiel einem "
-"drahtlosen Zugangspunkt (Hotspot). Andere Benutzer, die diesen Dienst nutzen, "
-"werden im Netzwerk automatisch gefunden."
-
-#: C/create-account.page:85(p)
-msgid "For more information, see <link xref=\"salut-protocol\"/>."
-msgstr "Weitere Informationen finden Sie in <link xref=\"salut-protocol\"/>."
-
-#: C/create-account.page:89(title) C/audio-video.page:205(p)
-msgid "SIP"
-msgstr "SIP"
+"Sie können Ihre früheren Unterhaltungen mit Ihren Kontakten oder in "
+"Unterhaltungsräumen anhand des Datums durchsuchen."
 
-#: C/create-account.page:91(p)
+#: C/prev-conv.page:91(item/p)
 msgid ""
-"SIP is an open system which allows users to have audio and video "
-"conversations over the Internet. You need to create an account with a SIP "
-"provider. You can communicate with all other SIP users, regardless of which "
-"SIP provider they use."
+"Select an account from the drop-down list in the top left. A list of "
+"contacts and chat room for that account will be shown below."
 msgstr ""
-"SIP ist ein offenes System für Audio- und Video-Unterhaltungen übar das "
-"Internet. Sie müssen ein SIP-Konto bei einem Dienstanbieter erstellen. "
-"Unabhängig davon, welchen Dienstanbieter Ihre Kontakte nutzen, können Sie mit "
-"allen anderen SIP-Benutzern kommunizieren."
+"Wählen Sie ein Konto in der Auswahlliste oben links. Eine Liste der Kontakte "
+"und Unterhaltungsräume für dieses Konto wird darunter angezeigt."
 
-#: C/create-account.page:97(p)
+#: C/prev-conv.page:95(item/p)
 msgid ""
-"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
-"index.php?page=register\">Ekiga.net</link> service does not currently work "
-"with <app>Empathy</app>."
+"Select a contact or chat room to view your previous conversations from. By "
+"default the most recent conversation will be shown."
 msgstr ""
-"Wegen technischer Unterschiede funktioniert <link href=\"https://www.ekiga."
-"net/index.php?page=register\">Ekiga.net</link> derzeit nicht mit "
-"<app>Empathy</app>."
+"Wählen Sie einen Kontakt oder Unterhaltungsraum, um dessen frühere "
+"Unterhaltungen zu betrachten. Per Vorgabe wird die letzte Unterhaltung "
+"angezeigt."
 
-#: C/create-account.page:102(p)
+#: C/prev-conv.page:99(item/p)
 msgid ""
-"Some SIP providers allow you to call normal phones from your computer. "
-"Generally, you will need to subscribe to a paid service for this feature."
+"You can browse your conversations by date. Days on which you had a "
+"conversation with the selected contact will be shown in bold text. Click a "
+"date to select it. Click the arrows next to the month and year to browse "
+"earlier dates."
 msgstr ""
-"Einige SIP-Dienste ermöglichen es, von Ihrem Rechner aus gewöhnliche Telefone "
-"anzurufen. Im Allgemeinen werden Sie sich hierfür an einem zu bezahlenden "
-"Dienst registrieren müssen."
-
-#: C/create-account.page:107(title) C/audio-video.page:165(p)
-msgid "IRC"
-msgstr "IRC"
+"Sie können Ihre Unterhaltungen anhand des Datums durchsuchen. Die Tage, an "
+"denen Sie eine Unterhaltung mit dem ausgewählten Kontakt geführt haben, "
+"werden fett hervorgehoben. Klicken Sie auf ein Datum, um es auszuwählen. "
+"Klicken Sie auf die Pfeile neben den Monats- und Jahresangaben, um zu "
+"früheren Daten zu gehen."
 
-#: C/create-account.page:109(p)
+#: C/prev-conv.page:105(section/p)
 msgid ""
-"You do not need to register for an account to use IRC. Although you specify a "
-"nickname when you add an IRC account to <app>Empathy</app>, this nickname is "
-"only established each time you connect. If another user is using the "
-"nickname, you will need to choose a new nickname."
+"You can search for text in the conversations by typing into the search field "
+"at the top. The matching conversations will be showed."
 msgstr ""
-"Sie müssen kein Konto registrieren, um das IRC zu benutzen. Obgleich Sie beim "
-"Hinzufügen eines IRC-Kontos in <app>Empathy</app> einen Spitznamen angeben, "
-"wird dieser Spitzname zwar jedes Mal bei einem Verbindungsaufbau festgelegt. "
-"Falls aber ein anderer Benutzer diesen Spitznamen verwendet, müssen Sie einen "
-"neuen wählen."
+"Sie können nach Text in den Unterhaltungen suchen, indem Sie ihn in das "
+"Suchfeld oben eingeben. Die damit übereinstimmenden unterhaltungen werden "
+"hervorgehoben."
 
-#: C/create-account.page:114(p)
+#: C/prev-conv.page:111(note/p)
 msgid ""
-"Some IRC networks use a service called NickServ to allow users to protect "
-"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
+"You can quickly view the previous conversations with one of your contacts "
+"from the <gui>Contact List</gui> window. Simply right click the contact and "
+"choose <gui>Previous Conversations</gui>. The <gui>Previous Conversations</"
+"gui> window will open with that contact already selected."
 msgstr ""
-"Einige IRC-Netzwerke verwenden einen Dienst namens NickServ, um Benutzern zu "
-"ermöglichen, ihre Spitznamen zu schützen. Weitere Informationen finden Sie in "
-"<link xref=\"irc-nick-password\"/>."
+"Im <gui>Kontaktlisten</gui>-Fenster können Sie schnell die früheren "
+"Unterhaltungen mit einem Ihrer Kontakte betrachten. Klicken Sie einfach mit "
+"der rechten Maustaste auf den Kontakt und wählen Sie <gui>Vorherige "
+"Unterhaltungen anschauen</gui>. Das Fenster <gui>Vorherige Unterhaltungen</"
+"gui> für den bereits ausgewählten Kontakt wird geöffnet."
 
-#: C/create-account.page:117(p)
+#: C/prob-conn-acctdisabled.page:7(info/desc)
 msgid ""
-"Some IRC servers are password protected. You will need to know the password "
-"to connect to these servers. Generally, these are private IRC networks."
+"The instant messaging account that you want to use is not enabled in the "
+"list of accounts."
 msgstr ""
-"Einige IRC-Server sind passwortgeschützt. Sie müssen das Passwort kennen, um "
-"eine Verbindung zu diesen Servern herzustellen. Im Allgemeinen sind dies "
-"private IRC-Netzwerke."
+"Das Sofortnachrichten-Konto, welches Sie verwenden wollen, ist in der "
+"Kontenliste nicht aktiviert."
 
-#: C/create-account.page:122(title)
-msgid "Proprietary Services"
-msgstr "Proprietäre Dienste"
+#: C/prob-conn-acctdisabled.page:34(page/title)
+msgid "My account is not enabled"
+msgstr "Mein Konto ist nicht aktiviert"
 
-#: C/create-account.page:124(p)
+#: C/prob-conn-acctdisabled.page:36(page/p)
 msgid ""
-"There are many proprietary instant messaging services that have been "
-"developed by different companies or organizations. <app>Empathy</app> allows "
-"you to connect to an existing account for most popular services. To create a "
-"new account with one of these services, you will need to visit the service’s "
-"web site and agree to its terms of use."
+"If the instant messaging account that you want to use is not enabled in the "
+"drop-down account list when you try to start a new conversation or join a "
+"room, your account details may not be correct."
 msgstr ""
-"Es gibt zahlreiche proprietäre Sofortnachrichtendienste, die von "
-"verschiedenen Unternehmen oder Organisationen entwickelt wurden. "
-"<app>Empathy</app> ermöglicht Ihnen für die populärsten dieser Dienste die "
-"Verbindung zu einem vorhandenen Konto. Um ein Konto bei einem dieser Dienste "
-"anzulegen, besuchen Sie bitte die Webseite des jeweiligen Anbieters. "
-"Bestätigen Sie dort die Nutzungsbedingungen."
-
-#: C/create-account.page:133(link) C/audio-video.page:135(p)
-msgid "AIM"
-msgstr "AIM"
-
-#: C/create-account.page:138(link) C/audio-video.page:160(p)
-msgid "ICQ"
-msgstr "ICQ"
-
-#: C/create-account.page:143(link) C/audio-video.page:175(p)
-msgid "MSN"
-msgstr "MSN"
-
-#: C/create-account.page:148(link) C/audio-video.page:210(p)
-msgid "Yahoo!"
-msgstr "Yahoo!"
+"Falls das zu verwendende Sofortnachrichten-Konto in der Auswahlliste nicht "
+"aktiviert ist, wenn Sie eine neue Unterhaltung starten oder einen Raum "
+"betreten wollen, könnten Ihre Kontendetails eventuell nicht korrekt sein."
 
-#: C/change-status.page:9(desc)
-msgid "Change your status to advertise your availability to your contacts."
+#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:45(item/p)
+#: C/prob-conn-neterror.page:53(item/p)
+msgid ""
+"Make sure that you are connected to the Internet, or to a local area network."
 msgstr ""
-"Ändern des Status, um Ihre Kontakte über Ihre Verfügbarkeit zu informieren."
+"Stellen Sie sicher, dass Sie mit dem Internet beziehungsweise mit einem "
+"lokalen Netzwerk verbunden sind."
 
-#: C/change-status.page:34(title)
-msgid "Change your status"
-msgstr "Ändern Ihres Status"
+#: C/prob-conn-acctdisabled.page:49(item/p)
+msgid ""
+"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
+"account that is not working."
+msgstr ""
+"Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Konten</gui></guiseq> und "
+"wählen Sie den nicht funktionierenden Kontakt aus."
 
-#: C/change-status.page:36(p)
+#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p)
 msgid ""
-"You can set your status to indicate your availability to your contacts. "
-"<app>Empathy</app> allows you to select from a list of defined statuses."
+"Type your username and password again to make sure that they are correct."
 msgstr ""
-"Sie können Ihren Status festlegen, um Ihre Verfügbarkeit Ihren Kontakten "
-"anzuzeigen. <app>Empathy</app> ermöglicht Ihnen, aus einer Liste "
-"vordefinierter Status zu wählen."
+"Geben sie Ihren Benutzernamen und Ihr Passwort erneut ein, um sicher zu "
+"stellen, dass diese korrekt sind."
 
-#: C/change-status.page:41(p)
+#: C/prob-conn-acctdisabled.page:60(item/p)
+#: C/prob-conn-neterror.page:64(item/p)
 msgid ""
-"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
+"Check in the <gui>Advanced</gui> section that all the details are correct. "
+"You should be able to find these details from the website of the messaging "
+"service."
 msgstr ""
-"Klicken Sie auf die Auswahlliste oben im <gui>Kontaktlisten</gui>-Fenster."
+"Überprüfen Sie im Abschnitt <gui>Fortgeschritten</gui>, dass alle Details "
+"korrekt sind. Es sollte möglich sein, diese Details auf der Webseite des "
+"jeweiligen Sofortnachrichtendienstes zu finden."
 
-#: C/change-status.page:46(p)
-msgid "Select a status from the list."
-msgstr "Wählen Sie einen Status in der Liste aus."
+#: C/prob-conn-acctdisabled.page:66(item/p)
+msgid "Check that the account is switched on."
+msgstr "Überprüfen Sie, ob das Konto eingeschaltet ist."
 
-#: C/change-status.page:52(p)
+#: C/prob-conn-auth.page:8(info/desc)
 msgid ""
-"See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
-"what they mean. You can also <link xref=\"set-custom-message\">add custom "
-"status messages</link> to provide more information about your availability to "
-"your contacts."
+"An error message which says “<gui>Authentication failed</gui>� appears in "
+"the main window."
 msgstr ""
-"In <link xref=\"status-icons\"/> finden Sie eine Liste mitgelieferter Status "
-"sowie deren Bedeutung. Sie können auch <link xref=\"set-custom-message"
-"\">benutzerdefinierte Statusmeldungen hinzufügen</link>, um für Ihre Kontakte "
-"weitere Informationen über Ihren Status bereitzustellen."
+"Eine Fehlermeldung »<gui>Legitimierung fehlgeschlagen</gui>« erscheint im "
+"Hauptfenster."
+
+#: C/prob-conn-auth.page:36(page/title)
+msgid "I get a message that says “Authentication failed�"
+msgstr "Eine Meldung zeigt »Legitimierung fehlgeschlagen« an"
 
-#: C/change-status.page:58(p)
+#: C/prob-conn-auth.page:38(page/p)
 msgid ""
-"If you do not use your computer for a while, or if the screensaver is on, the "
-"status will be automatically set to Away."
+"This kind of error happens when your instant messaging service is not "
+"allowing you to connect because it does not recognize your username or "
+"password for some reason."
 msgstr ""
-"Falls Sie Ihren Rechner für eine gewisse Zeit nicht bedienen oder der "
-"Bildschirmschoner eingeschaltet ist, wird der Status automatisch auf abwesend "
-"gesetzt."
+"Dieser Fehler geschieht, wenn Ihr Sofortnachrichtendienst keine Verbindung "
+"erlaubt, weil Benutzername oder Passwort aus verschiedenen Gründen nicht "
+"akzeptiert werden konnten."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/audio-video.page:58(None)
+#: C/prob-conn-auth.page:50(item/p)
 msgid ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
-msgstr "original"
+"Make sure that you have registered an account with the service you are "
+"trying to connect to. If you do not have an account, most services will not "
+"allow you to connect."
+msgstr ""
+"Stellen Sie sicher, dass Sie bei dem Dienst ein Konto registriert haben, mit "
+"dem Sie sich verbinden wollen. Falls Sie über kein Konto verfügen, "
+"verweigern die meisten Dienste die Verbindung."
 
-#: C/audio-video.page:8(desc)
+#: C/prob-conn-auth.page:57(item/p) C/prob-conn-name.page:43(item/p)
+#: C/prob-conn-neterror.page:58(item/p)
 msgid ""
-"Information on when it is possible to have an audio or video conversation."
+"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
+"\">edit</media> icon in the error message."
 msgstr ""
-"Informationen über die Möglichkeiten für Audio- und Video-Unterhaltungen."
-
-#: C/audio-video.page:32(title)
-msgid "Audio and video support"
-msgstr "Audio- und Video-Unterstützung"
+"Klicken Sie auf das <media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">Bearbeiten</media>-Symbol in der Fehlermeldung."
 
-#: C/audio-video.page:34(p)
+#: C/prob-conn-auth.page:68(item/p)
 msgid ""
-"You can only have audio and video conversation with contacts who are using an "
-"application which also supports this feature. When your contacts support "
-"audio or video conversations, you will see the following icons next to their "
-"names in the contact list:"
+"Deselect the <gui>Enabled</gui>, and then select it again to try to "
+"reconnect to the service."
 msgstr ""
-"Sie können Audio- und Video-Unterhaltungen nur mit Kontakten führen, die "
-"ebenfalls eine Anwendung benutzen, die dieses Funktionsmerkmal unterstützt. "
-"Wenn Ihre Kontakte Audio- oder Video-Unterhaltungen unterstützen, werden "
-"neben deren Namen in der Kontaktliste folgende Symbole angezeigt:"
+"Deaktivieren Sie das Ankreuzfeld <gui>Aktiviert</gui> und aktivieren Sie es "
+"erneut, um einen neuen Verbindungsversuch zu starten."
 
-#: C/audio-video.page:43(p)
-msgid "Icon"
-msgstr "Symbol"
+#: C/prob-conn-name.page:9(info/title)
+msgctxt "link:error-msg"
+msgid "“Name in use�"
+msgstr "»Name bereits in Verwendung«"
 
-#: C/audio-video.page:48(p)
-msgid "Description"
-msgstr "Beschreibung"
+#: C/prob-conn-name.page:10(info/desc)
+msgid ""
+"An error message which says “<gui>Name in use</gui>� appears in the main "
+"window."
+msgstr ""
+"Eine Fehlermeldung »<gui>Name bereits in Benutzung</gui>« erscheint im "
+"Hauptfenster."
 
-#: C/audio-video.page:58(media)
-msgid "Icon for audio conversation"
-msgstr "Symbol für Audio-Unterhaltung"
+#: C/prob-conn-name.page:33(page/title)
+msgid "I get a message that says “Name in use�"
+msgstr "Eine Meldung zeigt »Name bereits in Benutzung« an"
 
-#: C/audio-video.page:64(p)
-msgid "The contact is able to have an audio conversation."
-msgstr "Der Kontakt kann eine Audio-Unterhaltung führen."
+#: C/prob-conn-name.page:35(page/p)
+msgid ""
+"This kind of error happens when you try to connect to your IRC account and "
+"you are using a nickname that is already being used by someone else on that "
+"particular network."
+msgstr ""
+"Dieser Fehler tritt auf, wenn Sie sich mit Ihrem IRC-Konto verbinden wollen "
+"und Sie einen Spitznamen verwenden wollen, den in diesem bestimmten Netzwerk "
+"bereits jemand anders gewählt hat."
 
-#: C/audio-video.page:70(media)
-msgid "Icon for video conversation"
-msgstr "Symbol für Video-Unterhaltung"
+#: C/prob-conn-name.page:51(item/p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr ""
+"Geben Sie in das <guilabel>Spitzname</guilabel>-Textfeld einen neuen "
+"Spitznamen ein."
 
-#: C/audio-video.page:76(p)
-msgid "The contact is able to have a video conversation."
-msgstr "Der Kontakt kann eine Video-Unterhaltung führen."
+#: C/prob-conn-name.page:56(item/p)
+msgid ""
+"If you have registered that nickname within the network you are using, set "
+"the password for that nickname. For more information, see <link xref=\"irc-"
+"nick-password\"/>."
+msgstr ""
+"Falls Sie diesen Spitznamen in dem von Ihnen verwendeten Netzwerk "
+"registriert haben, legen Sie für diesen Spitznamen ein Passwort fest. "
+"Weitere Informationen hierzu finden Sie in <link xref=\"irc-nick-password\"/"
+">."
 
-#: C/audio-video.page:83(p)
+#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p)
 msgid ""
-"In order to have an audio conversation, you need to have a sound card that is "
-"supported by your operating system, and a working microphone."
+"Switch the account off, and then switch it on to try to reconnect to the "
+"service."
 msgstr ""
-"Um eine Audio-Unterhaltung führen zu können, benötigen Sie eine von Ihrem "
-"Betriebssystem unterstützte Soundkarte sowie ein funktionierendes Mikrofon."
+"Deaktivieren Sie das Konto und aktivieren Sie es erneut, um einen neuen "
+"Verbindungsversuch zu starten."
 
-#: C/audio-video.page:87(p)
+#: C/prob-conn-neterror.page:7(info/desc)
 msgid ""
-"In order to have a video conversation, you need to have a webcam that is "
-"supported by your operating system, and a working microphone."
+"An error message which says “<gui>Network error</gui>� appears in the main "
+"window."
 msgstr ""
-"Um eine Video-Unterhaltung führen zu können, benötigen Sie eine von Ihrem "
-"Betriebssystem unterstützte Webcam sowie ein funktionierendes Mikrofon."
+"Eine Fehlermeldung mit dem Text »<gui>Netzwerkfehler</gui>« erscheint im "
+"Hauptfenster."
 
-#: C/audio-video.page:95(title)
-msgid "Supported Account Types"
-msgstr "Unterstützte Kontentypen"
+#: C/prob-conn-neterror.page:34(page/title)
+msgid "I get a message that says “Network error�"
+msgstr "Eine Meldung zeigt einen »Netzwerkfehler« an"
 
-#: C/audio-video.page:97(p)
+#: C/prob-conn-neterror.page:42(page/p)
 msgid ""
-"You can only have audio and video conversations using accounts on certain "
-"supported services. The following table lists whether audio and video is "
-"supported for each type of account."
+"This kind of error happens when <app>Empathy</app> cannot communicate with "
+"the instant messaging service for some reason."
 msgstr ""
-"Sie können nur mit denjenigen Konten Audio- oder Video-Unterhaltungen führen, "
-"welche die entsprechenden Dienste unterstützen. In der folgenden Tabelle wird "
-"für jeden Kontentyp aufgelistet, ob Audio und Video unterstützt werden."
+"Dieser Fehler tritt auf, wenn <app>Empathy</app> aus irgendeinem Grund nicht "
+"in der Lage ist, mit dem Sofortnachrichtendienst zu kommunizieren."
 
-#: C/audio-video.page:102(p)
+#: C/prob-conn-neterror.page:46(page/p)
 msgid ""
-"Account types are provided by plugins. Your system may not have all of the "
-"following types available, or it may have types not listed here. Updated "
-"plugins may make audio or video conversations possible on account types that "
-"are listed as unsupported here."
+"Also, this kind of error happens when you try to use an IRC account without "
+"setting a nickname."
 msgstr ""
-"Kontentypen werden durch Plugins bereitgestellt. Auf Ihrem System könnten "
-"nicht alle der folgenden Typen verfügbar sein, oder die bei Ihnen verfügbaren "
-"Typen sind hier nicht aufgelistet. Durch aktualisierte Plugins könnte es "
-"möglich sein, dass hier als nicht unterstützte Typen aufgelistete Konten "
-"dennoch Audio- und Video-Unterhaltungen ermöglichen."
+"Dieser Fehler tritt auch auf, wenn Sie ein IRC-Konto verwenden wollen, ohne "
+"einen Spitznamen festzulegen."
+
+#: C/prob-conn-neterror.page:87(section/title)
+msgid "Proxy support"
+msgstr "Proxy-Unterstützung"
 
-#: C/audio-video.page:110(p)
+#: C/prob-conn-neterror.page:88(section/p)
 msgid ""
-"I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
-"need to look at the accessibility impact. I've <link href=\"http://mail.gnome."
-"org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
-"accessibility team</link> for input."
+"At the moment <app>Empathy</app> can not be configured to work with a proxy."
 msgstr ""
-"I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
-"need to look at the accessibility impact. I've <link href=\"http://mail.gnome."
-"org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
-"accessibility team</link> for input."
+"Momentan ist es nicht möglich, <app>Empathy</app> so zu konfigurieren, dass "
+"es mit einem Proxy-Server zusammenarbeitet."
 
-#: C/audio-video.page:118(p)
-msgid ""
-"There's recent work on telepathy-butterfly and papyon to support audio and "
-"video for MSN. It might be released in time for 2.28, but since it doesn't "
-"follow the Gnome release schedule, I can't be sure. If it looks like it's "
-"going to ship, let's mark it Yes."
+#: C/prob-conn.page:7(info/desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
 msgstr ""
-"There's recent work on telepathy-butterfly and papyon to support audio and "
-"video for MSN. It might be released in time for 2.28, but since it doesn't "
-"follow the Gnome release schedule, I can't be sure. If it looks like it's "
-"going to ship, let's mark it Yes."
+"Diagnostizieren häufiger Verbindungsprobleme mit einem "
+"Sofortnachrichtendienst."
 
-#: C/audio-video.page:128(p)
-msgid "Service"
-msgstr "Dienst"
+#: C/prob-conn.page:29(page/title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Probleme beim Verbinden zu einem Sofortnachrichtendienst"
 
-#: C/audio-video.page:129(p)
-msgid "Audio"
-msgstr "Audio"
+#: C/remove-account.page:8(info/desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "Ein Konto vollständig aus <app>Empathy</app> löschen."
 
-#: C/audio-video.page:130(p)
-msgid "Video"
-msgstr "Video"
+#: C/remove-account.page:34(page/title)
+msgid "Remove an account"
+msgstr "Löschen eines Kontos"
 
-#: C/audio-video.page:136(p) C/audio-video.page:137(p)
-#: C/audio-video.page:141(p) C/audio-video.page:142(p)
-#: C/audio-video.page:146(p) C/audio-video.page:147(p)
-#: C/audio-video.page:156(p) C/audio-video.page:157(p)
-#: C/audio-video.page:161(p) C/audio-video.page:162(p)
-#: C/audio-video.page:166(p) C/audio-video.page:167(p)
-#: C/audio-video.page:181(p) C/audio-video.page:182(p)
-#: C/audio-video.page:186(p) C/audio-video.page:187(p)
-#: C/audio-video.page:191(p) C/audio-video.page:192(p)
-#: C/audio-video.page:196(p) C/audio-video.page:197(p)
-#: C/audio-video.page:201(p) C/audio-video.page:202(p)
-#: C/audio-video.page:211(p) C/audio-video.page:212(p)
-#: C/audio-video.page:216(p) C/audio-video.page:217(p)
-msgid "No"
-msgstr "Nein"
+#: C/remove-account.page:36(page/p)
+msgid ""
+"You can completely remove an account from <app>Empathy</app> if you no "
+"longer wish to use the account. If you wish to use the account in "
+"<app>Empathy</app> again in the future, you will have to add your account "
+"details again."
+msgstr ""
+"Sie können ein Konto aus <app>Empathy</app> vollständig löschen, falls Sie "
+"dieses nicht mehr benutzen wollen. Sollten Sie in Zukunft dieses Konto in "
+"<app>Empathy</app> erneut nutzen wollen, dann müssen Sie die Kontendetails "
+"erneut eingeben."
 
-#: C/audio-video.page:140(p)
-msgid "Facebook Chat"
-msgstr "Facebook-Unterhaltung"
+#: C/remove-account.page:47(item/p)
+msgid ""
+"Select the account you wish to remove from the accounts list on the left "
+"side of the window."
+msgstr ""
+"Wählen Sie das Konto, das Sie aus der Kontenliste entfernen wollen, an der "
+"linken Seite des Fensters aus."
 
-#: C/audio-video.page:145(p)
-msgid "gadugadu"
-msgstr "gadugadu"
+#: C/remove-account.page:51(item/p)
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "Klicken Sie auf <gui style=\"button\">-</gui>."
 
-#: C/audio-video.page:150(p)
-msgid "Google Talk"
-msgstr "Google Talk"
+#: C/remove-account.page:54(item/p)
+msgid ""
+"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
+"button to permanently remove the account."
+msgstr ""
+"Ein Dialogfenster bittet darum, den Vorgang zu bestätigen. Klicken Sie auf "
+"den Knopf <gui>Entfernen</gui>, um das Konto dauerhaft zu entfernen."
 
-#: C/audio-video.page:151(p) C/audio-video.page:152(p)
-#: C/audio-video.page:171(p) C/audio-video.page:172(p)
-#: C/audio-video.page:176(p) C/audio-video.page:177(p)
-#: C/audio-video.page:206(p) C/audio-video.page:207(p)
-msgid "Yes"
-msgstr "Ja"
+#: C/remove-account.page:60(note/p)
+msgid ""
+"Even after removing an account, <app>Empathy</app> does not delete your "
+"conversation history for that account."
+msgstr ""
+"Auch nach dem Entfernen des Kontos löscht <app>Empathy</app> nicht die zu "
+"diesem Konto gehörenden Unterhaltungsmitschnitte."
 
-#: C/audio-video.page:155(p)
-msgid "Groupwise"
-msgstr "Groupwise"
+#: C/salut-protocol.page:8(info/desc)
+msgid "Understanding the People Nearby feature."
+msgstr "Erläuterungen zum Funktionsmerkmal »Personen in der Nähe«."
 
-#: C/audio-video.page:180(p)
-msgid "myspace"
-msgstr "myspace"
+#: C/salut-protocol.page:33(page/title)
+msgid "What is People Nearby?"
+msgstr "Was ist »Personen in der Nähe«?"
 
-#: C/audio-video.page:185(p)
-msgid "qq"
-msgstr "qq"
+#: C/salut-protocol.page:40(page/p)
+msgid ""
+"The People Nearby service is a serverless communication service: you do not "
+"need to connect and authenticate to a central server in order to use it."
+msgstr ""
+"Der Dienst »Personen in der Nähe« (People Nearby) ist ein "
+"Kommunikationsdienst, der ohne Server auskommt: Es ist nicht notwendig, sich "
+"mit einem Server zu verbinden und sich zu legitimieren, um den Dienst zu "
+"nutzen."
 
-#: C/audio-video.page:195(p)
-msgid "sametime"
-msgstr "gleichzeitig"
+#: C/salut-protocol.page:45(page/p)
+msgid ""
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
+msgstr ""
+"Dieses Nachrichtensystem ohne Server ist auf lokale Netzwerke beschränkt und "
+"erfordert keine aktive Internetverbindung."
 
-#: C/audio-video.page:200(p)
-msgid "silc"
-msgstr "silc"
+#: C/salut-protocol.page:49(page/p)
+msgid ""
+"The people that use this service inside the same local area network will be "
+"auto-discovered, and it will be possible to send them messages and files as "
+"with other services."
+msgstr ""
+"Teilnehmer dieses Dienstes innerhalb des gleichen lokalen Netzwerks werden "
+"automatisch ermittelt. Es ist möglich, ihnen Nachrichten und Dateien zu "
+"senden, wie mit anderen Diensten auch."
 
-#: C/audio-video.page:215(p)
-msgid "zephyr"
-msgstr "zephyr"
+#: C/salut-protocol.page:54(page/p)
+msgid ""
+"All the modern local area networks should be able to support this kind of "
+"service."
+msgstr ""
+"Alle modernen lokalen Netzwerke sollten in der Lage sein, diese Art Dienst "
+"zu unterstützen."
 
-#: C/audio-call.page:9(desc)
-msgid "Call your contacts over the Internet."
-msgstr "Ihre Kontakte über das Internet anrufen."
+#: C/send-file.page:8(info/desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Senden Sie eine Datei von Ihrem Rechner an einen Ihrer Kontakte."
 
-#: C/audio-call.page:27(title)
-msgid "Start an audio conversation"
-msgstr "Eine Audio-Unterhaltung starten"
+#: C/send-file.page:36(page/title)
+msgid "Send files"
+msgstr "Dateien senden"
 
-#: C/audio-call.page:29(p)
+#: C/send-file.page:45(item/p)
 msgid ""
-"You can call your contacts and have an audio conversation with them. This "
-"features only works with certain types of accounts, and it requires the other "
-"person to have an application that supports audio calls."
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
 msgstr ""
-"Sie können Ihre Kontakte anrufen und eine Audio-Unterhaltung mit ihnen "
-"führen. Dieses Funktionsmerkmal unterstützt verschiedene Kontentypen. "
-"Weiterhin ist es erforderlich, dass die anzurufende Person über eine "
-"Anwendung verfügt, die Audio-Anrufe unterstützt."
+"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, dem Sie "
+"eine Datei senden wollen, und klicken Sie anschließend auf <gui>Datei "
+"senden</gui>."
 
-#: C/audio-call.page:34(p)
+#: C/send-file.page:50(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" mime="
-"\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next to "
-"the name of the contact you wish to call and choose <gui style=\"menuitem"
-"\">Audio Call</gui>."
+"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
+"gui> <gui>Contact</gui><gui>Send file</gui></guiseq>."
 msgstr ""
-"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-Symbol "
-"neben dem Namen des Kontakts, den Sie anrufen wollen, und wählen Sie <gui "
-"style=\"menuitem\">Videoanruf</gui>."
+"Klicken Sie auf den Kontakt, an den Sie eine Datei senden wollen, und wählen "
+"Sie <guiseq><gui>Bearbeiten</gui><gui>Kontakt</gui><gui>Datei senden</gui></"
+"guiseq>."
 
-#: C/audio-call.page:55(p)
-msgid ""
-"To turn an audio conversation into a video conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
+#: C/send-file.page:58(item/p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
 msgstr ""
-"Um eine Audio-Unterhaltung in eine Video-Unterhaltung umzuwandeln, wählen Sie "
-"<guiseq><gui style=\"menu\">Anruf</gui><gui style=\"menuitem\">Video ein</"
-"gui></guiseq>."
+"Wählen Sie die zu sendende Datei aus und klicken Sie auf <gui>Senden</gui>."
 
-#: C/audio-call.page:63(title)
-msgid "Start an audio conversation with a meta-contact"
-msgstr "Eine Unterhaltung mit einem Meta-Kontakt starten"
+#: C/send-file.page:63(item/p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "Das Fenster <gui>Dateiübertragungen</gui> wird geöffnet."
 
-#: C/audio-call.page:71(p)
+#: C/send-file.page:66(item/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Audio Call</gui>."
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
+"to halt the transfer."
 msgstr ""
-"Wählen Sie den Kontakt aus, mit dem Sie eine Unterhaltung beginnen wollen, "
-"und wählen Sie im Menü  <gui style=\"menuitem\">Audioanruf</gui>."
-
-#: C/add-contact.page:9(desc)
-msgid "Add someone to the contact list."
-msgstr "Jemanden zur Kontaktliste hinzufügen."
+"Warten Sie darauf, dass Ihr Kontakt die Dateiübertragung akzeptiert, oder "
+"klicken Sie auf <gui>Stopp</gui>, um die Ãœbertragung zu stoppen."
 
-#: C/add-contact.page:33(title)
-msgid "Add someone to your list of contacts"
-msgstr "Jemanden zu Ihrer Kontaktliste hinzufügen"
+#: C/send-file.page:72(item/p)
+msgid ""
+"Once the transfer is finished, it is possible to close the <gui>File "
+"Transfers</gui> window."
+msgstr ""
+"Sobald die Dateiübertragung abgeschlossen ist, können Sie das Fenster "
+"<gui>Dateiübertragungen</gui> schließen."
 
-#: C/add-contact.page:37(p)
-msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+#: C/send-file.page:80(note/p)
+msgid ""
+"If you have multiple finished transfers listed in the window, click on "
+"<gui>Clear</gui> to empty the list. This will only remove the files from the "
+"list and will not delete them from your computer."
 msgstr ""
-"Wählen Sie <guiseq><gui>Unterhaltung</gui><gui>Kontakt hinzufügen</gui></"
-"guiseq>."
+"Falls mehrere abgeschlossene Dateiübertragungen in diesem Fenster "
+"aufgelistet sind, dann klicken Sie auf <gui>Leeren</gui>, um die Liste zu "
+"leeren. Dies entfernt die Dateien nur aus der Liste, aber nicht von Ihrem "
+"Rechner."
 
-#: C/add-contact.page:40(p)
+#: C/send-file.page:87(note/p)
 msgid ""
-"From the <gui>Account</gui> drop-down list, select the account you wish to "
-"use to connect to your contact. Your contact will need to be using the same "
-"service as the account you select."
+"It is possible to send files only using the following services: <em>Jabber</"
+"em>, <em>Google Talk</em> and <em>People Nearby</em>."
 msgstr ""
-"Wählen Sie in der <gui>Konten</gui>-Auswahlliste das Konto aus, mit dem Sie "
-"sich zu Ihrem Kontakt verbinden wollen. Es ist erforderlich, dass Ihr Kontakt "
-"den gleichen Dienst verwendet, den Sie hier angeben."
+"Mit folgenden Diensten können Sie Dateien versenden: <em>Jabber</em>, "
+"<em>Google Talk</em> und <em>People Nearby</em> (»Personen in der Nähe«)."
 
-#: C/add-contact.page:45(p)
+#: C/send-file.page:93(note/p)
 msgid ""
-"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
-"screen name, or other appropriate identifier for the service type."
+"In order to send a file to someone, you need to be connected to the "
+"Internet, or to a local area network."
 msgstr ""
-"Geben Sie im Feld <gui>Bezeichner</gui> die Anmeldekennung, den "
-"Benutzernamen, den angezeigten Namen oder andere entsprechende "
-"Identifizierungsmerkmale für den Diensttyp Ihre Kontakts ein."
+"Um jemandem eine Datei senden zu können, müssen Sie mit dem Internet oder "
+"einem lokalen Netzwerk verbunden sein."
+
+#: C/send-message.page:8(info/desc)
+msgid "Send a message to one of your contacts."
+msgstr "Eine Nachricht an einen Ihrer Kontakte senden."
+
+#: C/send-message.page:32(page/title)
+msgid "Send a message to someone"
+msgstr "Jemandem eine Nachricht senden"
 
-#: C/add-contact.page:49(p)
+#: C/send-message.page:36(item/p)
 msgid ""
-"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
-"to appear in your contact list."
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
 msgstr ""
-"Geben Sie in das <guilabel>Alias</guilabel>-Textfeld den Namen ein, so wie er "
-"in der Kontaktliste erscheinen soll."
+"Klicken Sie im Fenster <gui>Kontaktliste</gui> doppelt auf den Namen des "
+"Kontakts, mit dem Sie eine Unterhaltung beginnen wollen."
 
-#: C/add-contact.page:53(p)
-msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+#: C/send-message.page:42(item/p)
+msgid ""
+"A new window will open. Type a message into the box at the bottom of the "
+"window and press <key>Enter</key> to send it."
 msgstr ""
-"Klicken Sie auf <gui>Hinzufügen</gui>, um die Person zu Ihrer Kontaktliste "
-"hinzuzufügen."
+"Ein neues Fenster wird geöffnet. Geben Sie eine Nachricht in das Feld am "
+"unteren Rand des Fensters ein und drücken Sie die <key>Eingabetaste</key>, "
+"um sie zu senden."
+
+#: C/send-message.page:50(section/title)
+msgid "Send a message to a meta-contact"
+msgstr "Einem Meta-Kontakt eine Nachricht senden"
 
-#: C/add-contact.page:61(p)
+#: C/send-message.page:58(item/p)
 msgid ""
-"To add a new person to your list of contacts, you need to be connected to the "
-"Internet and to your account."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
 msgstr ""
-"Um eine neue Person zu Ihrer Kontaktliste hinzuzufügen, müssen Sie mit dem "
-"Internet und mit Ihrem Konto verbunden sein."
+"Wählen Sie den Kontakt aus, mit dem Sie eine Unterhaltung beginnen wollen, "
+"und wählen Sie im Menü  <gui style=\"menuitem\">Unterhaltung</gui>."
 
-#: C/add-account.page:9(desc)
-msgid "Add a new account to <app>Empathy</app>."
-msgstr "Einen neuen Kontakt zu <app>Empathy</app> hinzufügen."
+#: C/set-custom-status.page:9(info/desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr ""
+"Hinzufügen, Bearbeiten oder Löschen persönlicher Nachrichten für Ihren "
+"Status."
 
-#: C/add-account.page:39(title)
-msgid "Add a new account"
-msgstr "Hinzufügen eines neuen Kontos"
+#: C/set-custom-status.page:15(credit/name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
+
+#: C/set-custom-status.page:34(page/title)
+msgid "Set a custom message"
+msgstr "Festlegen einer benutzerdefinierten Nachricht"
 
-#: C/add-account.page:41(p)
+#: C/set-custom-status.page:36(page/p)
 msgid ""
-"You can add instant messaging accounts from any supported service to "
-"communicate with all of your contacts in <app>Empathy</app>. For some account "
-"providers, these steps will also allow you to register for a new account. For "
-"more details, see <link xref=\"create-account\"/>."
+"Sometimes you may want to set a custom message for your status, for example "
+"to let people know that you will be unavailable for a certain period of time."
 msgstr ""
-"Sie können Sofortnachrichten-Konten für jeden unterstützten Dienst anlegen, "
-"um mit allen Ihren Kontakten in <app>Empathy</app> zu kommunizieren. Für "
-"einige Dienstanbieter erlauben Ihnen diese Schritte auch die Registrierung "
-"eines neuen Kontos. Weitere Details hierzu finden Sie in <link xref=\"create-"
-"account\"/>."
+"Vielleicht wollen Sie eine benutzerdefinierte Nachricht für Ihren Status "
+"festlegen, zum Beispiel um jemanden darüber zu informieren, dass Sie für "
+"eine bestimmte Zeitspanne nicht verfügbar sein werden."
 
-#: C/add-account.page:52(p)
-msgid "Click <gui style=\"button\">Add</gui>."
-msgstr "Klicken Sie auf <gui style=\"button\">Hinzufügen</gui>."
+#: C/set-custom-status.page:40(page/p)
+msgid ""
+"It is possible to set a custom message based on the different statuses "
+"available."
+msgstr ""
+"Es ist möglich, eine benutzerdefinierte Nachricht festzulegen, basierend auf "
+"den verfügbaren Status."
 
-#: C/add-account.page:57(p)
+#: C/set-custom-status.page:46(item/p) C/set-custom-status.page:82(item/p)
 msgid ""
-"From the <gui>Protocol</gui> drop-down list, select the type of account you "
-"wish to add."
+"From the <gui>Contact List</gui> window, click on the drop-down list at the "
+"top."
 msgstr ""
-"Aus der <gui>Protokoll</gui>-Aufklappliste wählen Sie den Kontentyp, welchen "
-"Sie hinzufügen wollen."
+"Klicken Sie im<gui>Kontaktlisten</gui>-Fenster in die Auswahlliste oben."
 
-#: C/add-account.page:61(p)
+#: C/set-custom-status.page:52(item/p)
 msgid ""
-"If you do not already have a registered account, select <gui>Create a new "
-"account on the server</gui>. This feature is not available for all account "
-"types, and may not work with some account providers. See <link xref=\"create-"
-"account\"/> for more information."
+"Select the status you want to add a custom message to. You have to select "
+"the one identified with the label <gui>Custom Message</gui>."
 msgstr ""
-"Falls Sie noch kein Konto registriert haben, wählen Sie <gui>Ein neues Konto "
-"auf dem Server anlegen</gui>. Dieses Funktionsmerkmal ist nicht für alle "
-"Kontentypen verfügbar und funktioniert möglicherweise nicht mit allen "
-"Dienstanbietern. Weitere Informationen hierzu finden Sie in <link xref="
-"\"create-account\"/>."
+"Wählen Sie den Status aus, dem Sie eine benutzerdefinierte Nachricht "
+"zuordnen wollen. Sie müssen denjenigen mit der Bezeichnung "
+"<gui>Benutzerdefinierte Nachricht</gui> auswählen."
 
-#: C/add-account.page:66(p)
+#: C/set-custom-status.page:58(item/p)
 msgid ""
-"Enter the required information. For most accounts, you will only need a login "
-"ID and a password. Some accounts may require additional information. See "
-"<link xref=\"accounts-window#details\"/> for more information."
+"Enter your custom message in the text box at the top of the window, and "
+"press <key>Enter</key> to set the message."
 msgstr ""
-"Geben Sie die benötigten Informationen ein. Für die meisten Konten wird die "
-"Eingabe einer Anmeldekennung und eines Passworts genügen. Einige Konten "
-"könnten zusätzliche Angaben erfordern. Weitere Informationen hierzu finden "
-"Sie in <link xref=\"accounts-window#details\"/>."
+"Geben Sie Ihre benutzerdefinierte Nachricht in das Textfeld am oberen Rand "
+"des Fensters ein und drücken Sie die <key>Eingabetaste</key>, um sie zu "
+"speichern."
 
-#: C/add-account.page:71(p)
-msgid "Click <gui style=\"button\">Log in</gui>."
-msgstr "Klicken Sie auf <gui style=\"button\">Anmelden</gui>."
+#: C/set-custom-status.page:64(item/p)
+msgid ""
+"If you want to set the custom message as a favorite, saving it in order to "
+"use it again, click on the little heart on the right of the text box where "
+"you wrote your custom message."
+msgstr ""
+"Wenn Sie die benutzerdefinierte Nachricht als bevorzugt festlegen wollen, "
+"speichern Sie sie, um sie wiederverwenden zu können. Klicken Sie "
+"anschließend auf das kleine Herz an der rechten Seite des Textfeldes, in "
+"welches Sie Ihre benutzerdefinierte Nachricht eingegeben haben."
 
-#: C/add-account.page:78(p)
+#: C/set-custom-status.page:69(item/p)
 msgid ""
-"To change the name that identifies the account in the <gui>Accounts</gui> "
-"window, select the account from the list on the left and either click on the "
-"name or press the space bar. Edit the account name and press <key>Enter</key> "
-"when you’re finished."
+"If you do not do it, the custom message will not be available the next time "
+"you use <app>Empathy</app>. It will be saved only for the current session."
 msgstr ""
-"Um den Namen zu ändern, der das Konto im <gui>Konten</gui>-Fenster "
-"identifiziert, wählen Sie das Konto aus der linken Liste aus und klicken Sie "
-"anschließend entweder auf den Namen oder drücken Sie die <key>Leertaste</"
-"key>. Ändern Sie den Namen und drücken Sie die <key>Eingabetaste</key>, "
-"sobald Sie fertig sind."
+"Falls Sie es nicht tun, dann wird die benutzerdefinierte Nachricht bei der "
+"nächsten Benutzung von <app>Empathy</app> nicht verfügbar sein. Sie wird nur "
+"für die aktuelle Sitzung gespeichert."
 
-#: C/accounts-window.page:11(desc)
-msgid "Add, modify, and delete accounts."
-msgstr "Hinzufügen, Bearbeiten und Entfernen von Konten."
+#: C/set-custom-status.page:78(section/title)
+msgid "Edit and remove a custom message"
+msgstr "Eine benutzerdefinierte Nachricht bearbeiten und entfernen"
 
-#: C/accounts-window.page:33(title)
-msgid "Accounts Window"
-msgstr "Konten-Fenster"
+#: C/set-custom-status.page:88(item/p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Wählen Sie <gui>Benutzerdefinierte Nachrichten bearbeiten</gui>."
 
-#: C/accounts-window.page:35(p)
+#: C/set-custom-status.page:95(item/p)
+msgid "To edit a custom message:"
+msgstr "So bearbeiten Sie eine benutzerdefinierte Nachricht:"
+
+#: C/set-custom-status.page:100(item/p)
 msgid ""
-"The <gui>Accounts</gui> window allows you to add, modify, and delete accounts."
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
 msgstr ""
-"Das <gui>Konten</gui> ermöglicht Ihnen das Hinzufügen, Bearbeiten oder "
-"Entfernen von Kontakten."
+"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung "
+"aus, die Sie bearbeiten wollen, und klicken Sie zweimal darauf."
 
-#: C/accounts-window.page:43(title)
-msgid "Account Details"
-msgstr "Kontendetails"
+#: C/set-custom-status.page:106(item/p)
+msgid "Type the new custom message and press <key>Enter</key> to modify it."
+msgstr ""
+"Geben Sie die neue benutzerdefinierte Nachricht ein und drücken Sie die "
+"<key>Eingabetaste</key>, um die Änderungen anzuwenden."
 
-#: C/accounts-window.page:44(p)
+#: C/set-custom-status.page:113(item/p)
+msgid "To remove a custom message:"
+msgstr "So entfernen Sie eine benutzerdefinierte Nachricht:"
+
+#: C/set-custom-status.page:118(item/p)
 msgid ""
-"For most types of accounts, you can simply enter a login ID and a password. "
-"Certain accounts or account types, however, may require additional "
-"information."
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"remove."
 msgstr ""
-"Für die meisten Kontentypen können Sie einfach eine Anmeldekennung und ein "
-"Passwort eingeben. Bestimmte Konten oder Kontentypen könnten allerdings "
-"weitere Informationen erfordern."
+"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung "
+"aus, die Sie entfernen wollen."
 
-#: C/account-jabber.page:7(desc)
-msgid "Advanced options for Jabber and Google Talk accounts."
-msgstr "Fortgeschrittene Optionen für Konten bei Jabber und Google Talk."
+#: C/set-custom-status.page:124(item/p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "Klicken Sie auf den Knopf <gui>Entfernen</gui>."
 
-#: C/account-jabber.page:29(title)
-msgid "Jabber account details"
-msgstr "Jabber-Kontendetails"
+#: C/set-custom-status.page:133(item/p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "Klicken Sie auf <gui>Schließen</gui>, sobald Sie fertig sind."
 
-#: C/account-jabber.page:31(p)
+#: C/set-custom-status.page:140(note/p)
 msgid ""
-"Most Jabber accounts will require only a login ID and a password to connect. "
-"For some accounts or on certain types of networks, you may need to enter "
-"additional information in the <gui>Advanced</gui> section. Normally, you will "
-"not need to use the advanced options below. For general instructions on "
-"adding an account, see <link xref=\"add-account\"/>."
+"When you edit a custom message, it will not be set as the current status "
+"message. You will need to select it from the <gui>Contact List</gui> window."
 msgstr ""
-"Die meisten Jabber-Konten erfordern nur eine Anmeldekennung und ein Passwort "
-"für die Verbindung. Für einige Konten oder bestimmte Netzwerktypen können Sie "
-"zusätzliche Informationen im Abschnitt <gui>Fortgeschritten</gui> eingeben. "
-"Normalerweise werden Sie die unten angegebenen zusätzlichen Optionen nicht "
-"benötigen. Allgemeine Informationen über das Hinzufügen eines Kontos finden "
-"Sie in <link xref=\"add-account\"/>."
+"Wenn Sie eine neue benutzerdefinierte Nachricht bearbeiten, wird diese nicht "
+"als aktuelle Statusnachricht festgelegt. Sie müssen Sie im "
+"<gui>Kontaktlisten</gui>-Fenster auswählen."
 
-#: C/account-jabber.page:39(p)
-msgid ""
-"Google Talk is a type of Jabber account. These instructions hold for Google "
-"Talk accounts as well."
-msgstr ""
-"Google Talk ist eine Art Jabber-Konto. Diese Anweisungen gelten daher auch "
-"für Google Talk."
+#: C/share-desktop.page:7(info/desc)
+msgid "Show your desktop to your contacts."
+msgstr "Freigeben der Arbeitsumgebung für Ihre Kontakte."
 
-#: C/account-jabber.page:45(gui)
-msgid "Encryption required (TLS/SSL)"
-msgstr "Verschlüsselung erforderlich (TLS/SSL)"
+#: C/share-desktop.page:18(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
 
-#: C/account-jabber.page:46(gui)
-msgid "Ignore SSL certificate errors"
-msgstr "SSL-Zertifikat-Fehler ignorieren"
+#: C/share-desktop.page:33(page/title)
+msgid "Share your desktop"
+msgstr "Freigabe Ihrer Arbeitsumgebung"
 
-#: C/account-jabber.page:47(p)
+#: C/share-desktop.page:35(page/p)
 msgid ""
-"Whenever possible, communication between <app>Empathy</app> and the Jabber "
-"server is encrypted. If encrypted communication is not possible, messages may "
-"be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
-"<app>Empathy</app> from communicating with the Jabber server when encryption "
-"is not possible."
+"It is possible to share your desktop with some of your contacts. You can use "
+"this functionality to show your desktop to your contacts to, for example, "
+"ask for help or help your contacts resolve a problem."
 msgstr ""
-"Wann immer es möglich ist, wird die Kommunikation zwischen <app>Empathy</app> "
-"und dem Jabber-Server verschlüsselt. Falls verschlüsselte Kommunikation nicht "
-"möglich ist, können Nachrichten unverschlüsselt gesendet werden. Wählen Sie "
-"<gui>Verschlüsselung erforderlich</gui>, um eine Kommunikation von "
-"<app>Empathy</app> mit dem Jabber-Server zu verhindern, wenn Verschlüsselung "
-"nicht möglich ist."
+"Es ist möglich, Ihre Arbeitsumgebung für einige Ihrer Kontakte freizugeben "
+"oder deren freigegebene Arbeitsumgebungen zu benutzen. Sie können auf diese "
+"Weise Ihre Arbeitsumgebung Ihren Kontakten zeigen, um ihnen bei der Lösung "
+"von Problemen zu helfen oder selbst um Hilfe zu bitten."
 
-#: C/account-jabber.page:52(p)
+#: C/share-desktop.page:42(note/p)
 msgid ""
-"Some Jabber servers may encrypt data using invalid certificates, or using "
-"certificates from unknown authorities. If you trust the server you are "
-"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
-"allow encrypted communication with invalid certificates."
+"To be able to share your desktop, you need to have a VNC server, which has "
+"support for the feature, installed on your system. <app>Vino</app>, the "
+"GNOME VNC server, has the required support."
 msgstr ""
-"Einige Jabber-Server könnten Daten mit ungültigen Zertifikaten verschlüsseln "
-"oder Zertifikate von unbekannten Ausgabestellen verwenden. Falls Sie dem "
-"Server vertrauen, mit dem Sie sich verbinden wollen, wählen Sie <gui>SSL-"
-"Zertifikat-Fehler ignorieren</gui>, um verschlüsselte Kommunikation mit "
-"ungültigen Zertifikaten allgemein zuzulassen."
-
-#: C/account-jabber.page:59(gui)
-msgid "Resource"
-msgstr "Ressource"
+"Um Ihren Bildschirm freigeben zu können, benötigen Sie einen auf Ihrem "
+"System installierten VNC-Server, der dieses Funktionsmerkmal unterstützt. "
+"<app>Vino</app>, der VNC-Server von GNOME, verfügt über diese Funktionalität."
 
-#: C/account-jabber.page:60(gui)
-msgid "Priority"
-msgstr "Priorität"
+#: C/share-desktop.page:51(item/p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
+msgstr ""
+"Führen Sie im <gui>Kontaktlisten</gui>-Fenster eine der folgenden Aktionen "
+"aus:"
 
-#: C/account-jabber.page:61(p)
+#: C/share-desktop.page:56(item/p)
 msgid ""
-"If you have multiple applications (for instance, on separate computers) "
-"connected to your account at the same time, you can set a resource to "
-"uniquely identify each one. By default, <app>Empathy</app> will use "
-"<input>Telepathy</input> as the resource."
+"Select the contact you want to share your desktop with and choose "
+"<guiseq><gui>Edit</gui><gui>Contact</gui> <gui>Share My Desktop</gui></"
+"guiseq>."
 msgstr ""
-"Falls Sie über mehrere Anwendungen gleichzeitig mit Ihrem Konto verbunden "
-"sind, beispielsweise von verschiedenen Rechnern aus, können Sie eine "
-"Ressource zur eindeutigen Identifizierung jeder dieser Anmeldungen festlegen. "
-"Als Vorgabe verwendet <app>Empathy</app> als Ressource <input>Telepathy</"
-"input>."
+"Wählen Sie den Kontakt aus, für den Sie Ihre Arbeitsumgebung freigeben "
+"wollen, und wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Kontakt</"
+"gui><gui>Meine Arbeitsumgebung freigeben</gui></guiseq>."
 
-#: C/account-jabber.page:65(p)
+#: C/share-desktop.page:63(item/p)
 msgid ""
-"You can set the priority to specify which application should receive incoming "
-"messages from your contacts. New messages will be sent to the application "
-"with the highest priority."
+"Right-click on the name of the contact you want to share your desktop with "
+"and select <gui>Share My Desktop</gui>."
 msgstr ""
-"Sie können die Priorität festlegen, um anzugeben, welche Anwendung die "
-"eingehenden Nachrichten von Ihren Kontakten annehmen soll. Neue Nachrichten "
-"werden dabei zu der Anwendung mit der höchsten Priorität gesendet."
-
-#: C/account-jabber.page:70(gui)
-msgid "Override server settings"
-msgstr "Server-Einstellungen überschreiben"
+"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, für den "
+"Sie Ihre Arbeitsumgebung freigeben wollen und wählen Sie <gui>Meine "
+"Arbeitsumgebung freigeben</gui>."
 
-#: C/account-jabber.page:71(p)
+#: C/share-desktop.page:71(item/p)
 msgid ""
-"<app>Empathy</app> will use default settings to connect to the Jabber server "
-"based on your login ID. For some Jabber servers, you will need to enter "
-"custom server settings manually. These settings should be provided for you by "
-"your Jabber provider."
-msgstr ""
-"<app>Empathy</app> verwendet Vorgabeeinstellungen für Verbindungen zum Jabber-"
-"Server, basierend auf Ihrer Anmeldekennung. Für einige Jabber-Server müssen "
-"Sie benutzerdefinierte Einstellungen manuell eingeben. Diese Einstellungen "
-"sollte Ihnen Ihr Jabber-Dienstanbieter zur Verfügung stellen."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:106(None)
-msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
-msgstr "original"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:112(None)
-msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
-msgstr "original"
-
-#: C/account-irc.page:8(desc)
-msgid "Additional information necessary for connecting to IRC networks."
+"An invitation to view your desktop will be sent to the contact you have "
+"selected. To view your desktop, they will need to accept it."
 msgstr ""
-"Zusätzlich erforderliche Informationen für Verbindungen zu IRC-Netzwerken."
-
-#: C/account-irc.page:31(title)
-msgid "IRC account details"
-msgstr "IRC-Kontendetails"
+"Eine Einladung zum Betrachten Ihres Bildschirms wird an die ausgewählten "
+"Kontakte gesendet. Um Ihren Bildschirm anzuzeigen, müssen die Kontakte diese "
+"akzeptieren."
 
-#: C/account-irc.page:33(p)
+#: C/share-desktop.page:77(item/p)
 msgid ""
-"IRC accounts require different information than many other types of accounts. "
-"To create an IRC account, you must specify at least an IRC network and a "
-"nickname. This page details the information you can provide for an IRC "
-"account."
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
 msgstr ""
-"IRC-Konten erfordern andere Informationen als die meisten anderen "
-"Kontentypen. Um ein IRC-Konto zu erstellen, müssen Sie mindestens ein IRC-"
-"Netzwerk und einen Spitznamen angeben. Diese Seite erläutert die "
-"Informationen, die Sie für ein IRC-Konto angeben können."
-
-#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
-msgid "Network"
-msgstr "Netzwerk"
+"Sie können die Verbindung zum Kontakt über die Anwendung zur Freigabe Ihrer "
+"Arbeitsumgebung trennen."
 
-#: C/account-irc.page:46(p)
+#: C/share-desktop.page:82(note/p)
 msgid ""
-"IRC is an open system that allows people to run separate IRC networks. Each "
-"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
-"lists the most popular networks in the <gui>Network</gui> drop-down list. You "
-"can add additional networks. See <link xref=\"#networks\"/> below."
+"For more information about how to use the remote desktop sharing "
+"application, refer to its help."
 msgstr ""
-"IRC ist ein offenes System, welches Personen erlaubt, separate IRC-Netzwerke "
-"zu betreiben. Jedes Netzwerk ist in sich abgeschlossen und hat seine eigenen "
-"Benutzer und Unterhaltungsräume. <app>Empathy</app> listet die populärsten "
-"Netzwerke in der Auswahlliste <gui>Netzwerk</gui> auf. Sie können zusätzliche "
-"Netzwerke hinzufügen. Siehe <link xref=\"#networks\"/> nachfolgend."
-
-#: C/account-irc.page:53(gui)
-msgid "Nickname"
-msgstr "Spitzname"
+"Für weitere Informationen über die Benutzung der Anwendung zum Betrachten "
+"entfernter Arbeitsumgebungen ziehen Sie deren Hilfe zu Rate."
 
-#: C/account-irc.page:54(p)
+#: C/share-desktop.page:90(page/p)
 msgid ""
-"Your nickname is your unique name on the IRC network. Only one person on a "
-"network may use a given nickname. If you get an error message that says <link "
-"xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change your "
-"nickname."
+"When you share your desktop with someone else, it is possible to experience "
+"system performance slowdown and low Internet speed."
 msgstr ""
-"Ihr Spitzname ist Ihr eindeutiger Name im IRC-Netzwerk. Nur eine einzige "
-"Person in einem Netzwerk darf einen gegebenen Spitznamen verwenden. Falls Sie "
-"die Fehlermeldung <link xref=\"prob-conn-name\" role=\"error-msg\"/> "
-"erhalten, müssen Sie Ihren Spitznamen ändern."
-
-#: C/account-irc.page:60(gui)
-msgid "Password"
-msgstr "Passwort"
+"Wenn Sie Ihre Arbeitsumgebung für jemanden freigeben, kann das eine sinkende "
+"Systemleistung und eine langsamere Internetgeschwindigkeit zur Folge haben."
 
-#: C/account-irc.page:61(p)
+#: C/share-desktop.page:96(note/p)
 msgid ""
-"Some servers, particularly those on private networks, require a password to "
-"connect. If you are authorized to use the network, the network administrators "
-"should provide you with a password."
+"Some of your contacts may not be able to use this feature. It is necessary "
+"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
+"compatible remote desktop viewer application installed in their system."
 msgstr ""
-"Einige Server, insbesondere diejenigen in privaten Netzwerken, erfordern ein "
-"Passwort für die Verbindung. Falls Sie legitimiert sind, das Netzwerk zu "
-"benutzen, sollte Sie Ihnen dessen Verwalter ein Passwort zur Verfügung "
-"gestellt haben."
-
-#: C/account-irc.page:65(title)
-msgid "NickServ Passwords"
-msgstr "NickServ-Passwörter"
+"Beachten Sie, dass nicht alle Ihre Kontakte diese Funktionalität "
+"unterstützen. Sie benötigen dafür mindestens die Version 2.28 von "
+"<app>Empathy</app> sowie eine auf deren System installierte Anwendung zum "
+"Betrachten entfernter Arbeitsumgebungen."
 
-#: C/account-irc.page:66(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:39(media)
+msgctxt "_"
 msgid ""
-"On some networks, nicknames can be registered using a service known as "
-"NickServ. <app>Empathy</app> does not directly support nickname passwords. On "
-"some networks, including the popular freenode network, server passwords are "
-"automatically forwarded to NickServ, allowing you to set this field to "
-"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
-"more details."
-msgstr ""
-"In einigen Netzwerken können Spitznamen mit einem Dienst namens NickServ "
-"registriert werden. <app>Empathy</app> unterstützt Passwörter für Spitznamen "
-"nicht direkt. In einigen Netzwerken, zum Beispiel FreeNode, werden "
-"Serverpasswörter automatisch an NickServ weitergeleitet, was Ihnen "
-"ermöglicht, sich mit diesem Feld bei NickServ zu identifizieren. Weitere "
-"Details hierzu finden Sie in <link xref=\"irc-nick-password\"/>"
+"external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
+msgstr "original"
 
-#: C/account-irc.page:76(gui)
-msgid "Real name"
-msgstr "Realname"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:45(media)
+msgctxt "_"
+msgid "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
+msgstr "original"
 
-#: C/account-irc.page:77(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:53(media)
+msgctxt "_"
+msgid "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
+msgstr "original"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:62(media) C/status-icons.page:69(media)
+msgctxt "_"
 msgid ""
-"You can provide your real name in addition to your nickname. Other users will "
-"be able to see this when they view your information."
-msgstr ""
-"Zusätzlich zu Ihrem Spitznamen können Sie auch Ihren echten Namen angeben. "
-"Dieser wird anderen Benutzern angezeigt, wenn diese Ihre persönlichen "
-"Informationen betrachten."
+"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+msgstr "original"
+
+#: C/status-icons.page:7(info/desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "Erläuterung der verschiedenen Status und deren Symbole."
 
-#: C/account-irc.page:81(gui)
-msgid "Quit message"
-msgstr "Verlassen-Nachricht"
+#: C/status-icons.page:35(page/title)
+msgid "Status Types and Icons"
+msgstr "Typen des Anwesenheitsstatus und Symbole"
 
-#: C/account-irc.page:82(p)
+#: C/status-icons.page:39(item/title)
 msgid ""
-"When you go offline, a quit message is sent to all the chat rooms you’re in "
-"and to all the users you’re having a private conversation with. Use this "
-"field to provide a custom quit message."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png"
+"\">Available icon</media> <gui>Available</gui>"
 msgstr ""
-"Wenn Sie sich abmelden, wird eine Beenden-Nachricht an alle "
-"Unterhaltungsräume gesendet, in denen Sie sich befinden, sowie an alle "
-"Benutzer, mit denen Sie eine private Unterhaltung führen. Verwenden Sie "
-"dieses Feld, um eine benutzerdefinierte Nachricht bereitzustellen."
-
-#: C/account-irc.page:94(title)
-msgid "IRC Networks"
-msgstr "IRC-Netzwerke"
+"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png"
+"\">Verfügbar-Symbol</media> <gui>Verfügbar</gui>"
 
-#: C/account-irc.page:97(title)
-msgid "Networks"
-msgstr "Netzwerke"
-
-#: C/account-irc.page:99(p)
+#: C/status-icons.page:41(item/p)
 msgid ""
-"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
-"another IRC network, you can add it to the list. You can also modify networks "
-"and remove them from the list."
+"Use the <em>Available</em> status when you are at your computer and able to "
+"chat with your contacts. You can set a custom message for this status."
 msgstr ""
-"<app>Empathy</app> enthält eine Liste populärer IRC-Netzwerke. Falls Sie ein "
-"anderes IRC-Netzwerk wünschen, können Sie es zur Liste hinzufügen. Sie können "
-"auch Netzwerke bearbeiten oder aus der Liste entfernen."
+"Verwenden Sie den Status <em>Verfügbar</em>, wenn Sie sich an Ihrem Rechner "
+"befinden und somit Unterhaltungen mit Ihren Kontakten führen können. Sie "
+"können für diesen Status eine benutzerdefinierte Nachricht festlegen."
 
-#: C/account-irc.page:104(p)
+#: C/status-icons.page:45(item/title)
 msgid ""
-"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
-"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Busy icon</"
+"media> <gui>Busy</gui>"
 msgstr ""
-"Um ein Netzwerk zur Liste hinzuzufügen, klicken Sie auf <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height="
-"\"16\">Hinzufügen</media>."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png"
+"\">Beschäftigt-Symbol</media> <gui>Beschäftigt</gui>"
 
-#: C/account-irc.page:107(p)
+#: C/status-icons.page:47(item/p)
 msgid ""
-"To modify a network in the list, select the network and click <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height="
-"\"16\">Edit</media>."
+"Use the <em>Busy</em> status to let your contacts know that you don’t want "
+"to chat right now. They can still contact you, for instance if they have "
+"something urgent they need to discuss. By default, <app>Empathy</app> will "
+"not use notification bubbles and sounds when you are busy. You can set a "
+"custom message for this status."
 msgstr ""
-"Um ein Netzwerk in der Liste zu bearbeiten, wählen Sie es aus und klicken auf "
-"<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width="
-"\"16\" height=\"16\">Bearbeiten</media>."
+"Verwenden Sie den Status <em>Beschäftigt</em>, wenn Sie Ihre Kontakte "
+"darüber informieren wollen, dass Sie gerade keine Unterhaltung wünschen. "
+"Diese können Sie trotzdem noch kontaktieren, beispielsweise in dringenden "
+"Fällen. Per Vorgabe zeigt <app>Empathy</app> keine einblendenden "
+"Benachrichtigungen an oder spielt Klänge ab, wenn Sie beschäftigt sind. Sie "
+"können für diesen Status eine benutzerdefinierte Nachricht festlegen."
 
-#: C/account-irc.page:110(p)
+#: C/status-icons.page:53(item/title)
 msgid ""
-"To remove a network from the list, select the network and click <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
-"height=\"16\">Remove</media>."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Away icon</"
+"media> <gui>Away</gui>"
 msgstr ""
-"Um ein Netzwerk aus der Liste zu entfernen, wählen Sie es aus und klicken auf "
-"<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width="
-"\"16\" height=\"16\">Entfernen</media>."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Abwesend-"
+"Symbol</media> <gui>Abwesend</gui>"
 
-#: C/account-irc.page:115(p)
+#: C/status-icons.page:55(item/p)
 msgid ""
-"When adding or modifying a network, you can enter the following information:"
+"Use the <em>Away</em> status when you are going away from your computer. "
+"<app>Empathy</app> automatically sets your status to Away if you do not use "
+"your computer for a while, or if your screensaver is on. By default, "
+"<app>Empathy</app> will not use notification bubbles and sounds when you are "
+"away. You can set a custom message for this status."
 msgstr ""
-"Beim Hinzufügen oder Ändern eines Netzwerks können Sie die folgenden "
-"Informationen eingeben:"
+"Verwenden Sie den Status <em>Beschäftigt</em>, wenn Sie sich von Ihrem "
+"Rechner entfernen. <app>Empathy</app> setzt Ihren Status automatisch auf "
+"abwesend, wenn Sie Ihren Rechner für einen gewissen Zeitraum nicht bedienen "
+"oder wenn der Bildschirmschoner eingeschaltet ist. <app>Empathy</app> zeigt "
+"keine einblendenden Benachrichtigungen an oder spielt Klänge ab, wenn Sie "
+"abwesend sind. Sie können für diesen Status eine benutzerdefinierte "
+"Nachricht festlegen."
 
-#: C/account-irc.page:121(p)
+# Passt do, Symbol wird doppelt verwendet
+#: C/status-icons.page:62(item/title)
 msgid ""
-"This is the name of the network as you want it to appear in the list of "
-"networks."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline "
+"icon</media> <gui>Invisible</gui>"
 msgstr ""
-"Dies ist der Name des Netzwerks, so wie der in der Liste der Netzwerke "
-"erscheinen soll."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png"
+"\">Abgemeldet-Symbol</media> <gui>Unsichtbar</gui>"
 
-#: C/account-irc.page:125(gui)
-msgid "Charset"
-msgstr "Zeichensatz"
+#: C/status-icons.page:64(item/p)
+msgid ""
+"When you set your status to <em>Invisible</em>, you will appear as offline "
+"to your contacts. You will still be connected to your accounts, and you "
+"still see your contacts’ statuses and start conversations with them."
+msgstr ""
+"Wenn Sie Ihren Status auf <em>Unsichtbar</em> setzen, erscheinen Sie für "
+"Ihre Kontakte als abgemeldet. Sie sind noch immer mit Ihren Kontakten "
+"verbunden. Sie sehen deren Status und können Unterhaltungen mit Ihnen "
+"beginnen."
 
-#: C/account-irc.page:126(p)
+#: C/status-icons.page:69(item/title)
 msgid ""
-"This specifies the character encoding that is typically used on this network. "
-"A character encoding is a specific way of recording characters internally in "
-"a computer. There are many character encodings, and you need to use the same "
-"character encoding as other users to see their messages correctly."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline "
+"icon</media> <gui>Offline</gui>"
 msgstr ""
-"Dies legt die Zeichenkodierung fest, die typischerweise in diesem Netzwerk "
-"verwendet wird. Eine Zeichenkodierung ist eine spezifische Art der internen "
-"Aufzeichnung von Zeichen in einem Rechner. Es gibt zahlreiche "
-"Zeichenkodierungen. Sie müssen die gleiche Kodierung wie die anderen Benutzer "
-"verwenden, damit deren Nachrichten korrekt angezeigt werden können."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png"
+"\">Abgemeldet-Symbol</media> <gui>Abgemeldet</gui>"
 
-#. Translators: Recommend character encodings that are common
-#. for your language.
-#: C/account-irc.page:135(p)
+#: C/status-icons.page:71(item/p)
 msgid ""
-"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
-"can handle text from most of the world's languages. Another common encoding "
-"for English and some other Western languages is ISO-8859-1."
+"Setting your status to <em>Offline</em> disconnects you from all of your "
+"accounts."
 msgstr ""
-"Als Vorgabe verwendet <app>Empathy</app> UTF-8, eine moderne "
-"Zeichenkodierung, die mit Texten aus den meisten Sprachen der Welt umgehen "
-"kann. Eine weitere häufig benutzte Kodierung für Englisch und andere "
-"westliche Sprachen ist ISO-8859-1."
+"Wenn Sie Ihren Status auf <em>Abgemeldet</em> setzen, werden alle "
+"Verbindungen zu Ihren Kontakten getrennt."
+
+#: C/video-call.page:10(info/desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "Beginnen Sie eine Videounterhaltung mit einem Ihrer Kontakte."
 
-#: C/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "Server"
+#: C/video-call.page:29(page/title)
+msgid "Start a video conversation"
+msgstr "Eine Video-Unterhaltung beginnen"
 
-#: C/account-irc.page:142(p)
+#: C/video-call.page:31(page/p)
 msgid ""
-"An IRC network may have many servers you can connect to. When you are "
-"connected to a server on a particular network, you can communicate with all "
-"users on all other servers on that network. You can add and remove servers "
-"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
+"If you have a webcam, you can call your contacts and have a video "
+"conversation with them. This feature only works with certain types of "
+"accounts, and it requires the other person to have an application that "
+"supports video calls."
 msgstr ""
-"Ein IRC-Netzwerk kann aus vielen Servern bestehen, mit denen Sie sich "
-"verbinden können. Wenn Sie mit einem Server in einem bestimmten Netzwerk "
-"verbunden sind, dann können Sie auch mit den Benutzern auf anderen Servern "
-"dieses Netzwerks kommunizieren. Sie können mit Hilfe der Knöpfe "
-"<gui>Hinzufügen</gui> und <gui>Entfernen</gui> Server dieses Netzwerks "
-"hinzufügen und entfernen."
+"Falls Sie über eine Webcam verfügen, können Sie Ihre Kontakte für eine "
+"Videounterhaltung anrufen. Dieses Funktionsmerkmal steht nur für bestimmte "
+"Kontentypen zur Verfügung. Außerdem muss die andere Person mit einer "
+"Anwendung arbeiten, die Videoanrufe unterstützt."
 
-#: C/account-irc.page:147(p)
+#: C/video-call.page:38(item/p)
 msgid ""
-"When a server is selected, click the field under <gui>Server</gui> or "
-"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
-"to focus the field, and press the space bar to begin editing."
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+"next to the name of the contact you wish to call and choose <gui style="
+"\"menuitem\">Video Call</gui>."
 msgstr ""
-"Wenn ein Server ausgewählt ist, klicken Sie auf die Felder unter <gui>Server</"
-"gui> oder <gui>Port</gui>, um diese zu bearbeiten. Alternativ verwenden Sie "
-"die linke und rechte Pfeiltaste, um das Feld zu fokussieren. Mit der "
-"Leertaste beginnen Sie mit der Bearbeitung."
+"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image"
+"\" mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-"
+"Symbol neben dem Namen des Kontakts, den Sie anrufen wollen, und wählen Sie "
+"<gui style=\"menuitem\">Videoanruf</gui>."
 
-#: C/account-irc.page:151(p)
+#: C/video-call.page:55(note/p)
 msgid ""
-"Select the check box in the <gui>SSL</gui> column to encrypt all "
-"communication with a server. Note that this does not prevent other users on "
-"the network from seeing what you write on public chat rooms."
+"To turn a video conversation into an audio conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
 msgstr ""
-"Aktivieren Sie das Ankreuzfeld in der <gui>SSL</gui>-Spalte, um jegliche "
-"Kommunikation mit dem Server zu verschlüsseln. Beachten Sie, dass dies andere "
-"Benutzer des Netzwerks nicht daran hindern wird, alles zu sehen, was Sie in "
-"öffentlichen Unterhaltungsräumen schreiben."
+"Um eine Video-Unterhaltung in eine Audio-Unterhaltung umzuwandeln, wählen "
+"Sie <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video "
+"aus</gui></guiseq>."
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/index.page:0(None)
-msgid "translator-credits"
+#: C/video-call.page:61(section/title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "Beginnen einer Videounterhaltung mit einem Meta-Kontakt"
+
+#: C/video-call.page:69(item/p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
 msgstr ""
-"Mario Blättermann <mariobl@freenet.de>, 2008, 2009, 2010, 2011\n"
-"Philipp Kerling <k.philipp@gmail.com>, 2008\n"
-"Christian Kirbach <Christian.Kirbach@googlemail.com>, 2010."
-
-#~ msgid ""
-#~ "In order to be able to share your desktop or to remotely use your contacts "
-#~ "desktop, it is necessary to have a remote desktop viewer application "
-#~ "installed in your system."
-#~ msgstr ""
-#~ "Um Ihre Arbeitsumgebung freizugeben oder die Arbeitsumgebungen Ihrer "
-#~ "entfernten Kontakte zu benutzen, ist eine auf Ihrem System installierte "
-#~ "Anwendung zum Betrachten entfernter Arbeitsumgebungen notwendig."
-
-#~ msgid ""
-#~ "A request will be sent to the contact you want to share your desktop with. "
-#~ "If they accept, the default remote desktop viewer application will be "
-#~ "launched in order to permit you to disconnect the user that is controlling "
-#~ "your desktop."
-#~ msgstr ""
-#~ "Es wird eine Anfrage an den Kontakt gesendet, dem Sie Ihre Arbeitsumgebung "
-#~ "freigeben wollen. Falls diese akzeptiert wird, dann wird die "
-#~ "voreingestellte Anwendung zum Betrachten entfernter Arbeitsumgebungen "
-#~ "gestartet, damit es Ihnen ermöglicht wird, die Verbindung zu dem Benutzer "
-#~ "zu trennen, der Ihre Arbeitsumgebung steuert."
+"Wählen Sie den Kontakt aus, mit dem Sie eine Unterhaltung beginnen wollen, "
+"und wählen Sie im Menü  <gui style=\"menuitem\">Videoanruf</gui>."
+
+#~ msgid "milo@ubuntu.com"
+#~ msgstr "milo@ubuntu.com"
+
+#~ msgid "shaunm@gnome.org"
+#~ msgstr "shaunm@gnome.org"
+
+#~ msgid "Available icon"
+#~ msgstr "Symbol »Verfügbar«"
+
+#~ msgid "Available"
+#~ msgstr "Verfügbar"
+
+#~ msgid "Busy icon"
+#~ msgstr "Symbol »Beschäftigt«"
+
+#~ msgid "Busy"
+#~ msgstr "Beschäftigt"
+
+#~ msgid "Away icon"
+#~ msgstr "Symbol »Abwesend«"
+
+#~ msgid "Away"
+#~ msgstr "Abwesend"
+
+#~ msgid "Offline icon"
+#~ msgstr "Symbol »Abgemeldet«"
+
+#~ msgid "Invisible"
+#~ msgstr "Unsichtbar"
+
+#~ msgid "Offline"
+#~ msgstr "Abgemeldet"
+
+#~ msgid "kittykat3756@gmail.com"
+#~ msgstr "kittykat3756@gmail.com"
+
+#~ msgid "jwcampbell@gmail.com"
+#~ msgstr "jwcampbell@gmail.com"
+
+#~ msgid "philbull@gmail.com"
+#~ msgstr "philbull@gmail.com"
+
+#~ msgid "I'd like to see this played up a bit more."
+#~ msgstr "I'd like to see this played up a bit more."
+
+#~ msgid "shaunm"
+#~ msgstr "shaunm"
diff --git a/help/es/es.po b/help/es/es.po
index a50bfe697..5fd837aeb 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -1,13 +1,13 @@
 # translation of empathy-help.master.po to Español
 # Jorge González <jorgegonz@svn.gnome.org>, 2009, 2010, 2011.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy-help.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-19 21:11+0000\n"
-"PO-Revision-Date: 2011-12-20 12:58+0100\n"
+"POT-Creation-Date: 2012-02-17 15:08+0000\n"
+"PO-Revision-Date: 2012-02-17 17:27+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,1831 +16,1791 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:39(None) C/audio-video.page:70(None)
-#: C/audio-call.page:36(None)
-msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+#| msgid "translator-credits"
+msgctxt "_"
+msgid "translator-credits"
+msgstr ""
+"Daniel Mustieles <daniel.mustieles@gmail.com>, 2012\n"
+"Jorge González <jorgegonz@svn.gnome.org>, 2008-2010"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:28(media)
+#| msgid ""
+#| "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+msgctxt "_"
+msgid ""
+"external ref='figures/empathy-logo.png' "
+"md5='1afc419a644e90b16393807e35cb5cb2'"
 msgstr ""
-"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+"external ref='figures/empathy-logo.png' "
+"md5='1afc419a644e90b16393807e35cb5cb2'"
 
-#: C/video-call.page:10(desc)
-msgid "Start a video conversation with one of your contacts."
-msgstr "Iniciar una conversación de vídeo con uno de sus contactos."
+#: C/index.page:7(info/title)
+#| msgid "Empathy Internet Messenger"
+msgctxt "link"
+msgid "Empathy Internet Messenger"
+msgstr "Mensajería para Internet Empathy"
 
-#: C/video-call.page:22(name) C/status-icons.page:16(name)
-#: C/share-desktop.page:14(name) C/set-custom-status.page:19(name)
-#: C/send-file.page:21(name) C/salut-protocol.page:18(name)
-#: C/remove-account.page:19(name) C/prob-conn-neterror.page:19(name)
-#: C/prob-conn-name.page:18(name) C/prob-conn-auth.page:21(name)
-#: C/prob-conn-acctdisabled.page:19(name) C/prev-conv.page:17(name)
-#: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
-#: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
-#: C/irc-manage.page:20(name) C/irc-join-room.page:16(name)
-#: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name)
-#: C/introduction.page:13(name) C/index.page:19(name)
-#: C/import-account.page:23(name) C/hide-contacts.page:11(name)
-#: C/group-conversations.page:19(name) C/geolocation-what-is.page:18(name)
-#: C/geolocation-turn.page:18(name) C/geolocation-supported.page:16(name)
-#: C/geolocation-privacy.page:17(name) C/geolocation-not-showing.page:17(name)
-#: C/geolocation.page:17(name) C/favorite-rooms.page:14(name)
-#: C/disable-account.page:21(name) C/create-account.page:19(name)
-#: C/audio-video.page:17(name) C/audio-call.page:19(name)
-#: C/add-account.page:21(name)
+#: C/index.page:8(info/title)
+#| msgid "Empathy Internet Messenger"
+msgctxt "text"
+msgid "Empathy Internet Messenger"
+msgstr "Mensajeri�a para Internet Empathy"
+
+#: C/index.page:19(credit/name) C/add-account.page:21(credit/name)
+#: C/audio-call.page:19(credit/name) C/audio-video.page:17(credit/name)
+#: C/create-account.page:19(credit/name)
+#: C/disable-account.page:21(credit/name)
+#: C/favorite-rooms.page:14(credit/name) C/geolocation.page:17(credit/name)
+#: C/geolocation-not-showing.page:17(credit/name)
+#: C/geolocation-privacy.page:17(credit/name)
+#: C/geolocation-supported.page:16(credit/name)
+#: C/geolocation-turn.page:18(credit/name)
+#: C/geolocation-what-is.page:18(credit/name)
+#: C/group-conversations.page:19(credit/name)
+#: C/hide-contacts.page:11(credit/name) C/import-account.page:23(credit/name)
+#: C/introduction.page:13(credit/name) C/irc-commands.page:10(credit/name)
+#: C/irc-join-pwd.page:17(credit/name) C/irc-join-room.page:16(credit/name)
+#: C/irc-manage.page:19(credit/name) C/irc-nick-password.page:18(credit/name)
+#: C/irc-send-file.page:16(credit/name)
+#: C/irc-start-conversation.page:15(credit/name)
+#: C/link-contacts.page:15(credit/name) C/prev-conv.page:17(credit/name)
+#: C/prob-conn-acctdisabled.page:19(credit/name)
+#: C/prob-conn-auth.page:21(credit/name) C/prob-conn-name.page:18(credit/name)
+#: C/prob-conn-neterror.page:19(credit/name)
+#: C/remove-account.page:19(credit/name) C/salut-protocol.page:18(credit/name)
+#: C/send-file.page:21(credit/name) C/set-custom-status.page:19(credit/name)
+#: C/share-desktop.page:14(credit/name) C/status-icons.page:16(credit/name)
+#: C/video-call.page:22(credit/name)
 msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
-#: C/video-call.page:23(email) C/status-icons.page:17(email)
-#: C/share-desktop.page:15(email) C/set-custom-status.page:20(email)
-#: C/send-file.page:22(email) C/salut-protocol.page:19(email)
-#: C/remove-account.page:20(email) C/prob-conn-neterror.page:20(email)
-#: C/prob-conn-name.page:19(email) C/prob-conn-auth.page:22(email)
-#: C/prob-conn-acctdisabled.page:20(email) C/prev-conv.page:18(email)
-#: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
-#: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
-#: C/irc-manage.page:21(email) C/irc-join-room.page:17(email)
-#: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email)
-#: C/introduction.page:14(email) C/index.page:20(email)
-#: C/import-account.page:24(email) C/hide-contacts.page:12(email)
-#: C/group-conversations.page:20(email) C/geolocation-what-is.page:19(email)
-#: C/geolocation-turn.page:19(email) C/geolocation-supported.page:17(email)
-#: C/geolocation-privacy.page:18(email)
-#: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
-#: C/favorite-rooms.page:15(email) C/disable-account.page:22(email)
-#: C/create-account.page:20(email) C/audio-video.page:18(email)
-#: C/audio-call.page:20(email) C/add-account.page:22(email)
-msgid "milo@ubuntu.com"
-msgstr "milo@ubuntu.com"
-
-#: C/video-call.page:26(p) C/status-icons.page:24(p)
-#: C/share-desktop.page:22(p) C/set-custom-status.page:23(p)
-#: C/send-message.page:21(p) C/send-file.page:25(p)
-#: C/salut-protocol.page:22(p) C/remove-account.page:23(p)
-#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:23(p)
-#: C/prob-conn-name.page:22(p) C/prob-conn-auth.page:25(p)
-#: C/prob-conn-acctdisabled.page:23(p) C/prev-conv.page:25(p)
-#: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p)
-#: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
-#: C/irc-manage.page:24(p) C/irc-join-room.page:20(p)
-#: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p)
-#: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p)
-#: C/hide-contacts.page:15(p) C/group-conversations.page:23(p)
-#: C/geolocation-what-is.page:22(p) C/geolocation-turn.page:22(p)
-#: C/geolocation-supported.page:20(p) C/geolocation-privacy.page:21(p)
-#: C/geolocation-not-showing.page:21(p) C/geolocation.page:21(p)
-#: C/favorite-rooms.page:18(p) C/disable-account.page:29(p)
-#: C/create-account.page:23(p) C/change-status.page:28(p)
-#: C/audio-video.page:21(p) C/audio-call.page:23(p) C/add-contact.page:22(p)
-#: C/add-account.page:29(p) C/accounts-window.page:22(p)
-#: C/account-jabber.page:18(p) C/account-irc.page:20(p)
+#: C/index.page:23(license/p) C/account-irc.page:20(license/p)
+#: C/account-jabber.page:18(license/p) C/accounts-window.page:22(license/p)
+#: C/add-account.page:29(license/p) C/add-contact.page:22(license/p)
+#: C/audio-call.page:23(license/p) C/audio-video.page:21(license/p)
+#: C/change-status.page:28(license/p) C/create-account.page:23(license/p)
+#: C/disable-account.page:29(license/p) C/favorite-rooms.page:18(license/p)
+#: C/geolocation.page:21(license/p)
+#: C/geolocation-not-showing.page:21(license/p)
+#: C/geolocation-privacy.page:21(license/p)
+#: C/geolocation-supported.page:20(license/p)
+#: C/geolocation-turn.page:22(license/p)
+#: C/geolocation-what-is.page:22(license/p)
+#: C/group-conversations.page:23(license/p) C/hide-contacts.page:15(license/p)
+#: C/import-account.page:31(license/p) C/introduction.page:17(license/p)
+#: C/irc-commands.page:14(license/p) C/irc-join-pwd.page:21(license/p)
+#: C/irc-join-room.page:20(license/p) C/irc-manage.page:23(license/p)
+#: C/irc-nick-password.page:22(license/p) C/irc-send-file.page:20(license/p)
+#: C/irc-start-conversation.page:19(license/p)
+#: C/link-contacts.page:19(license/p) C/prev-conv.page:25(license/p)
+#: C/prob-conn-acctdisabled.page:23(license/p)
+#: C/prob-conn-auth.page:25(license/p) C/prob-conn-name.page:22(license/p)
+#: C/prob-conn-neterror.page:23(license/p) C/prob-conn.page:18(license/p)
+#: C/remove-account.page:23(license/p) C/salut-protocol.page:22(license/p)
+#: C/send-file.page:25(license/p) C/send-message.page:21(license/p)
+#: C/set-custom-status.page:23(license/p) C/share-desktop.page:22(license/p)
+#: C/status-icons.page:24(license/p) C/video-call.page:26(license/p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Compartir Igual 3.0"
 
-#: C/video-call.page:29(title)
-msgid "Start a video conversation"
-msgstr "Comenzar una conversación de vídeo"
-
-#: C/video-call.page:31(p)
+#: C/index.page:27(page/title)
 msgid ""
-"If you have a webcam, you can call your contacts and have a video "
-"conversation with them. This feature only works with certain types of "
-"accounts, and it requires the other person to have an application that "
-"supports video calls."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
 msgstr ""
-"Si tiene una cámara web puede llamar a sus contactos y tener conversaciones "
-"de vídeo con ellos. Esta característica sólo funciona con ciertos tipos de "
-"cuentas y requiere que la otra persona tenga una aplicación que soporte "
-"llamadas de vídeo."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+"\">Logotipo de la mensajería para Internet Empathy</media> Mensajería para "
+"Internet Empathy"
 
-#: C/video-call.page:38(p)
-msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
-"next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Video Call</gui>."
-msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui> pulse el icono de <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">vídeo llamada</"
-"media> junto al nombre del contacto al que desea llamar y seleccione <gui "
-"style=\"menuitem\">Llamada de vídeo</gui>."
+#: C/index.page:35(section/title)
+msgid "Account Management"
+msgstr "Gestión de cuentas"
 
-#: C/video-call.page:44(p) C/audio-call.page:42(p)
-msgid ""
-"A new window will open. When the connection is established, you will see "
-"<gui>Connected</gui> at the bottom of the window, along with the total "
-"conversation time."
-msgstr ""
-"Se abrirá una ventana nueva. Cuando se establezca la conexión, verá escrito, "
-"en la parte inferior de la ventana, <gui>Connectado</gui> y el tiempo total "
-"de conversación."
+#: C/index.page:39(section/title)
+msgid "Contact Management"
+msgstr "Gestión de contactos"
 
-#: C/video-call.page:49(p) C/audio-call.page:48(p)
-msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
-msgstr ""
-"Para finalizar una conversación pulse <gui style=\"button\">Colgar</gui>."
+#: C/index.page:43(section/title)
+msgid "Text Conversations"
+msgstr "Conversaciones de texto"
 
-#: C/video-call.page:55(p)
-msgid ""
-"To turn a video conversation into an audio conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
-msgstr ""
-"Para convertir una conversación de vídeo en una de sonido, elija "
-"<guiseq><gui style=\"menu\">Vídeo</gui><gui style=\"menuitem\">Vídeo "
-"apagado</gui></guiseq>."
+#: C/index.page:47(section/title)
+msgid "Audio and Video Conversations"
+msgstr "Conversaciones de sonido y vídeo"
 
-#: C/video-call.page:61(title)
-msgid "Start a video conversation with a meta-contact"
-msgstr "Iniciar una conversación de vídeo con uno de sus metacontactos."
+#: C/index.page:51(section/title)
+msgid "Advanced Actions"
+msgstr "Acciones avanzadas"
 
-#: C/video-call.page:64(p) C/send-message.page:53(p) C/audio-call.page:66(p)
-msgid ""
-"From the <gui>Contact List</gui> window, right-click on the meta-contact."
-msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui>, pulse con el botón derecho "
-"sobre el metacontacto."
+#: C/index.page:55(section/title) C/irc-manage.page:57(section/title)
+msgid "Common Problems"
+msgstr "Problemas comunes"
 
-#: C/video-call.page:69(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/account-irc.page:106(media)
+#| msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+msgctxt "_"
+msgid ""
+"external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'"
+msgstr ""
+"external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/account-irc.page:109(media) C/prob-conn-auth.page:58(media)
+#: C/prob-conn-name.page:44(media) C/prob-conn-neterror.page:59(media)
+#| msgid ""
+#| "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+msgctxt "_"
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Video Call</gui>."
+"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'"
 msgstr ""
-"Seleccione el contacto con el que quiere tener la conversacio�n y, del menu�, "
-"seleccione <gui style=\"menuitem\">Llamada de vídeo</gui>."
+"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'"
 
-#: C/video-call.page:76(p) C/send-message.page:65(p) C/audio-call.page:78(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/account-irc.page:112(media)
+#| msgid ""
+#| "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+msgctxt "_"
 msgid ""
-"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
-"contact in the <gui>Contact List</gui> window, and stop over it for a "
-"second: a small pop-up message will appear showing the number of the "
-"contacts that form the meta-contact."
+"external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'"
 msgstr ""
-"Para reconocer si un contecto es un <em>metacontacto</em>, mueva su ratón "
-"sobre un contacto en la ventana de la <gui>Lista de contactos</gui> y "
-"deténgalo encima un segundo: aparecerá un pequeño mensaje emergente "
-"mostrando el número de contactos que forman el metacontacto."
+"external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:39(None)
-msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
-msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:45(None)
-msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
-msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:53(None)
-msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
-msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:62(None) C/status-icons.page:69(None)
-msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
-msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
-
-#: C/status-icons.page:7(desc)
-msgid "Understanding the various statuses and status icons."
-msgstr "Entender los diversos estados e iconos de estado."
+#: C/account-irc.page:8(info/desc)
+msgid "Additional information necessary for connecting to IRC networks."
+msgstr "Información adicional necesaria para conectarse a redes IRC."
 
-#: C/status-icons.page:20(name) C/salut-protocol.page:36(cite)
-#: C/prev-conv.page:21(name) C/import-account.page:27(name)
-#: C/disable-account.page:25(name) C/audio-video.page:109(cite)
-#: C/audio-video.page:117(cite) C/add-account.page:25(name)
-#: C/accounts-window.page:18(name) C/account-jabber.page:14(name)
-#: C/account-irc.page:16(name)
+#: C/account-irc.page:16(credit/name) C/account-jabber.page:14(credit/name)
+#: C/accounts-window.page:18(credit/name) C/add-account.page:25(credit/name)
+#: C/disable-account.page:25(credit/name)
+#: C/import-account.page:27(credit/name) C/prev-conv.page:21(credit/name)
+#: C/status-icons.page:20(credit/name)
 msgid "Shaun McCance"
 msgstr "Shaun McCance"
 
-#: C/status-icons.page:21(email) C/prev-conv.page:22(email)
-#: C/import-account.page:28(email) C/disable-account.page:26(email)
-#: C/add-account.page:26(email) C/accounts-window.page:19(email)
-#: C/account-jabber.page:15(email) C/account-irc.page:17(email)
-msgid "shaunm@gnome.org"
-msgstr "shaunm@gnome.org"
-
-#: C/status-icons.page:35(title)
-msgid "Status Types and Icons"
-msgstr "Tipos de estados e iconos"
-
-#: C/status-icons.page:39(media)
-msgid "Available icon"
-msgstr "Icono de disponible"
-
-#: C/status-icons.page:40(gui)
-msgid "Available"
-msgstr "Disponible"
+#: C/account-irc.page:31(page/title)
+msgid "IRC account details"
+msgstr "Detalles de la cuenta IRC"
 
-#: C/status-icons.page:41(p)
+#: C/account-irc.page:33(page/p)
 msgid ""
-"Use the <em>Available</em> status when you are at your computer and able to "
-"chat with your contacts. You can set a custom message for this status."
+"IRC accounts require different information than many other types of "
+"accounts. To create an IRC account, you must specify at least an IRC network "
+"and a nickname. This page details the information you can provide for an IRC "
+"account."
 msgstr ""
-"Use el estado <em>Disponible</em> cuando está en su equipo y disponible para "
-"charlar con sus contactos. Puede establecer un mensaje personalizado para "
-"este estado."
-
-#: C/status-icons.page:45(media)
-msgid "Busy icon"
-msgstr "Icono de ocupado"
-
-#: C/status-icons.page:46(gui)
-msgid "Busy"
-msgstr "Ocupado"
+"Las cuentas de IRC requieren información diferente que otros tipos de "
+"cuentas. Para crear una cuenta IRC debe especificar al menos la red IRC y el "
+"apodo. Esta página detalla la información que puede proporcionar para una "
+"cuenta de IRC."
 
-#: C/status-icons.page:47(p)
+#: C/account-irc.page:39(note/p) C/irc-manage.page:37(note/p)
 msgid ""
-"Use the <em>Busy</em> status to let your contacts know that you don’t want "
-"to chat right now. They can still contact you, for instance if they have "
-"something urgent they need to discuss. By default, <app>Empathy</app> will "
-"not use notification bubbles and sounds when you are busy. You can set a "
-"custom message for this status."
+"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
+"<app>Empathy</app>."
 msgstr ""
-"Use el estado <em>Ocupado</em> para hacer saber a sus contactos que no "
-"quiere charlar ahora. Aún podrán contactarle si, por ejemplo, tienen algo "
-"urgente que necesitan discutir. De forma predeterminada <app>Empathy</app> "
-"no usará las burbujas de notificación y sonidos cuando esté ocupado. Puede "
-"establecer un mensaje personalizado para este estado."
-
-#: C/status-icons.page:53(media)
-msgid "Away icon"
-msgstr "Icono de ausente"
+"Debe tener instalado el paquete <sys>telepathy-idle</sys> para poder usar el "
+"IRC en <app>Empathy</app>."
 
-#: C/status-icons.page:54(gui)
-msgid "Away"
-msgstr "Ausente"
+#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title)
+#| msgid "Click <gui>Create</gui>."
+msgid "<gui>Network</gui>"
+msgstr "<gui>Red</gui>"
 
-#: C/status-icons.page:55(p)
+#: C/account-irc.page:46(item/p)
 msgid ""
-"Use the <em>Away</em> status when you are going away from your computer. "
-"<app>Empathy</app> automatically sets your status to Away if you do not use "
-"your computer for a while, or if your screensaver is on. By default, "
-"<app>Empathy</app> will not use notification bubbles and sounds when you are "
-"away. You can set a custom message for this status."
+"IRC is an open system that allows people to run separate IRC networks. Each "
+"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
+"lists the most popular networks in the <gui>Network</gui> drop-down list. "
+"You can add additional networks. See <link xref=\"#networks\"/> below."
 msgstr ""
-"Use el estado <em>Ausente</em> cuando esté haciendo algo lejos del equipo. "
-"<app>Empathy</app> establece automáticamente su estado a Ausente si no usa "
-"su equipo durante un rato o si su salvapantallas está activado. De forma "
-"predeterminada <app>Empathy</app> no usará las burbujas de notificación y "
-"sonidos cuando esté ocupado. Puede establecer un mensaje personalizado para "
-"este estado."
-
-#: C/status-icons.page:62(media) C/status-icons.page:69(media)
-msgid "Offline icon"
-msgstr "Icono de desconectado"
+"IRC es un sistema abierto que permite a la gente estar en diferentes redes "
+"IRC. Cada red es distinta y tiene sus propios usuarios y salas de chat. "
+"<app>Empathy</app> lista las redes más populares en la lista desplegable "
+"<gui>Red</gui>. Puede añadir redes adicionales. Consulte debajo la <link "
+"xref=\"#networks\"/>."
 
-#: C/status-icons.page:63(gui)
-msgid "Invisible"
-msgstr "Invisible"
+#: C/account-irc.page:53(item/title)
+#| msgid "Click <gui>Create</gui>."
+msgid "<gui>Nickname</gui>"
+msgstr "<gui>Alias</gui>"
 
-#: C/status-icons.page:64(p)
+#: C/account-irc.page:54(item/p)
 msgid ""
-"When you set your status to <em>Invisible</em>, you will appear as offline "
-"to your contacts. You will still be connected to your accounts, and you "
-"still see your contacts’ statuses and start conversations with them."
+"Your nickname is your unique name on the IRC network. Only one person on a "
+"network may use a given nickname. If you get an error message that says "
+"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change "
+"your nickname."
 msgstr ""
-"Cuando su estado es <em>Invisible</em> aparecerá como desconectado para sus "
-"contactos. Aún estará conectado a sus cuentas, verá los estados de sus "
-"contactos y podrá iniciar conversaciones con ellos."
+"Su apodo es su nombre único en la red IRC. Sólo una persona en una red puede "
+"usar cierto apodo. Si obtiene un mensaje que dice <link xref=\"prob-conn-name"
+"\" role=\"error-msg\"/> deberá cambiar su apodo."
 
-#: C/status-icons.page:70(gui)
-msgid "Offline"
-msgstr "Desconectado"
+#: C/account-irc.page:60(item/title)
+msgid "<gui>Password</gui>"
+msgstr "<gui>Contraseña</gui>"
 
-#: C/status-icons.page:71(p)
+#: C/account-irc.page:61(item/p)
 msgid ""
-"Setting your status to <em>Offline</em> disconnects you from all of your "
-"accounts."
+"Some servers, particularly those on private networks, require a password to "
+"connect. If you are authorized to use the network, the network "
+"administrators should provide you with a password."
 msgstr ""
-"Establecer su estado como <em>Desconectado</em> le desconecta de todas sus "
-"cuentas."
-
-#: C/share-desktop.page:7(desc)
-msgid "Show your desktop to your contacts."
-msgstr "Mostrar su escritorio a sus contactos."
-
-#: C/share-desktop.page:18(name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
-
-#: C/share-desktop.page:19(email)
-msgid "kittykat3756@gmail.com"
-msgstr "kittykat3756@gmail.com"
+"Algunos servidores, particularmente aquellos en redes privadas, requieren "
+"una contraseña para la conexión. Si está autorizado a usar la red, los "
+"administradores de la red le proporcionarán una contraseña."
 
-#: C/share-desktop.page:33(title)
-msgid "Share your desktop"
-msgstr "Compartir su escritorio"
+#: C/account-irc.page:65(note/title)
+msgid "NickServ Passwords"
+msgstr "Contraseñas NickServ"
 
-#: C/share-desktop.page:35(p)
+#: C/account-irc.page:66(note/p)
 msgid ""
-"It is possible to share your desktop with some of your contacts. You can use "
-"this functionality to show your desktop to your contacts to, for example, "
-"ask for help or help your contacts resolve a problem."
+"On some networks, nicknames can be registered using a service known as "
+"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
+"On some networks, including the popular freenode network, server passwords "
+"are automatically forwarded to NickServ, allowing you to set this field to "
+"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
+"more details."
 msgstr ""
-"Es posible compartir su escritorio con algunos de sus contactos. Puede usar "
-"esta funcionalidad para mostrar su escritorio a sus contactos, o preguntar "
-"por ayuda o ayudar a sus contactos a resolver problemas."
+"En algunas redes los apodos se pueden registrar con un servicio conocido "
+"como NickServ. <app>Empathy</app> no soporta directamente contraseñas para "
+"apodos. En algunas redes, incluyendo la popular red freenode, las "
+"contraseñas de servidor se redireccionan automáticamente a NickServ, "
+"permitiéndole usar este campo para identificarse con NickServ. Para obtener "
+"más información consulte la <link xref=\"irc-nick-password\"/>."
 
-#: C/share-desktop.page:42(p)
+#: C/account-irc.page:76(item/title)
+#| msgid "Click <gui>Create</gui>."
+msgid "<gui>Real name</gui>"
+msgstr "<gui>Nombre real</gui>"
+
+#: C/account-irc.page:77(item/p)
 msgid ""
-"To be able to share your desktop, you need to have a VNC server, which has "
-"support for the feature, installed on your system. <app>Vino</app>, the "
-"GNOME VNC server, has the required support."
+"You can provide your real name in addition to your nickname. Other users "
+"will be able to see this when they view your information."
 msgstr ""
-"Para poder compartir su escritorio necesita tener un servidor VNC, que "
-"soporte para la característica, instalado en su sistema. <app>Vino</app>, el "
-"servidor VNC de GNOME, tiene el soporte necesario."
+"Puede proporcionar su nombre real además de su apodo. Otros usuarios podrán "
+"verlo al ver su información."
 
-#: C/share-desktop.page:51(p)
-msgid "From the <gui>Contact List</gui> window, do one of the following:"
-msgstr ""
-"En la ventana de la <gui>Lista de contactos</gui> realice una de las "
-"siguientes:"
+#: C/account-irc.page:81(item/title)
+#| msgid "Select <gui>Edit Custom Message</gui>."
+msgid "<gui>Quit message</gui>"
+msgstr "<gui>Mensaje de salida</gui>"
 
-#: C/share-desktop.page:56(p)
+#: C/account-irc.page:82(item/p)
 msgid ""
-"Select the contact you want to share your desktop with and choose "
-"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></"
-"guiseq>."
+"When you go offline, a quit message is sent to all the chat rooms you’re in "
+"and to all the users you’re having a private conversation with. Use this "
+"field to provide a custom quit message."
 msgstr ""
-"Seleccione el contacto con el que quiere compartir su escritorio y elija "
-"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Compartir mi escritorio</"
-"gui></guiseq>."
+"Cuando se desconecta se envía un mensaje de salida a todas las salas de chat "
+"en las que está y a todos los usuarios con los que tiene una conversación "
+"privada. Use este campo para proporcionar un mensaje personalizado."
+
+#: C/account-irc.page:94(info/title)
+#| msgid "IRC Networks"
+msgctxt "link"
+msgid "IRC Networks"
+msgstr "Redes IRC"
+
+#: C/account-irc.page:97(section/title)
+msgid "Networks"
+msgstr "Redes"
 
-#: C/share-desktop.page:63(p)
+#: C/account-irc.page:99(section/p)
 msgid ""
-"Right-click on the name of the contact you want to share your desktop with "
-"and select <gui>Share My Desktop</gui>."
+"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
+"another IRC network, you can add it to the list. You can also modify "
+"networks and remove them from the list."
 msgstr ""
-"Pulse con el botón derecho del ratón sobre el nombre del contacto con el que "
-"quiera compartir su escritorio y seleccione <gui>Compartir mi escritorio</"
-"gui>."
+"<app>Empathy</app> incluye una lista de redes IRC populares. Si quiere usar "
+"otra red IRC puede añadirla a la lista. También puede modificar y quitar "
+"redes de la lista."
 
-#: C/share-desktop.page:71(p)
+#: C/account-irc.page:104(item/p)
 msgid ""
-"An invitation to view your desktop will be sent to the contact you have "
-"selected. To view your desktop, they will need to accept it."
+"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
+"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
 msgstr ""
-"Se enviará una invitación para ver su escritorio al contacto que haya "
-"seleccionado. Deberán aceptarla para poder ver su escritorio."
+"Para añadir una red a la lista pulse <media type=\"image\" mime=\"image/png"
+"\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Añadir</media>."
 
-#: C/share-desktop.page:77(p)
+#: C/account-irc.page:107(item/p)
 msgid ""
-"You can disconnect the contact from your computer using your desktop sharing "
-"application."
+"To modify a network in the list, select the network and click <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
+"height=\"16\">Edit</media>."
 msgstr ""
-"Puede desconectar el contacto de su equipo usando su aplicación de "
-"compartición de escritorio."
+"Para modificar una red de la lista seleccione la red y pulse <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
+"height=\"16\">Editar</media>."
 
-#: C/share-desktop.page:82(p)
+#: C/account-irc.page:110(item/p)
 msgid ""
-"For more information about how to use the remote desktop sharing "
-"application, refer to its help."
+"To remove a network from the list, select the network and click <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
+"height=\"16\">Remove</media>."
 msgstr ""
-"Consulte la ayuda para obtener más información acerca de cómo usar la "
-"aplicación de compartición de escritorio."
+"Para quitar una red de la lista seleccione y pulse <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16"
+"\">Quitar</media>."
 
-#: C/share-desktop.page:90(p)
+#: C/account-irc.page:115(section/p)
 msgid ""
-"When you share your desktop with someone else, it is possible to experience "
-"system performance slowdown and low Internet speed."
+"When adding or modifying a network, you can enter the following information:"
 msgstr ""
-"Cuando comparte su escritorio con otros, es posible que experimente una "
-"ralentización del rendimiento del sistema y una baja velocidad de Internet."
+"Al añadir o modificar una red puede introducir la siguiente información:"
 
-#: C/share-desktop.page:96(p)
+#: C/account-irc.page:121(item/p)
 msgid ""
-"Some of your contacts may not be able to use this feature. It is necessary "
-"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
-"compatible remote desktop viewer application installed in their system."
+"This is the name of the network as you want it to appear in the list of "
+"networks."
 msgstr ""
-"Puede que algunos de sus contactos no puedan usar esta característica. Es "
-"necesario que tengan al menos la versión 2.28 de <app>Empathy</app> y una "
-"aplicación de visión remota de escritorios instalada en su sistema."
-
-#: C/set-custom-status.page:9(desc)
-msgid "Add, edit or delete personal messages for your status."
-msgstr "Añadir, editar o borrar un mensaje personal para su estado."
-
-#: C/set-custom-status.page:15(name)
-msgid "Jim Campbell"
-msgstr "Jim Campbell"
-
-#: C/set-custom-status.page:16(email)
-msgid "jwcampbell@gmail.com"
-msgstr "jwcampbell@gmail.com"
+"Este es el nombre de la red como quiere que aparezca en la lista de redes."
 
-#: C/set-custom-status.page:34(title)
-msgid "Set a custom message"
-msgstr "Establecer un mensaje personalizado"
+#: C/account-irc.page:125(item/title)
+#| msgid "Click <gui>Create</gui>."
+msgid "<gui>Charset</gui>"
+msgstr "<gui>Conjunto de caracteres</gui>"
 
-#: C/set-custom-status.page:36(p)
+#: C/account-irc.page:126(item/p)
 msgid ""
-"Sometimes you may want to set a custom message for your status, for example "
-"to let people know that you will be unavailable for a certain period of time."
+"This specifies the character encoding that is typically used on this "
+"network. A character encoding is a specific way of recording characters "
+"internally in a computer. There are many character encodings, and you need "
+"to use the same character encoding as other users to see their messages "
+"correctly."
 msgstr ""
-"A veces puede querer usar un mensaje personal para su estado, por ejemplo, "
-"para hacer saber a sus contactos que no estará disponible por un periodo de "
-"tiempo."
+"Esto especifica la codificación de caracteres usada generalmente en esta "
+"red. Una codificación de caracteres es una forma específica de grabar los "
+"caracteres internamente en un equipo. Existen muchas configuraciones de "
+"caracteres y debe usar la misma configuración de caracteres que el resto de "
+"usuarios para poder ver sus mensajes correctamente."
 
-#: C/set-custom-status.page:40(p)
+#: C/account-irc.page:135(item/p)
 msgid ""
-"It is possible to set a custom message based on the different statuses "
-"available."
+"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
+"can handle text from most of the world's languages. Another common encoding "
+"for English and some other Western languages is ISO-8859-1."
 msgstr ""
-"Es posible establecer un mensaje personalizado basado en los diferentes "
-"estados disponibles."
+"De forma predeterminada <app>Empathy</app> usa UTF-8, una codificación de "
+"caracteres moderna que puede gestionar texto en la mayoría de los idiomas "
+"del mundo. Otra configuración de caracteres común para inglés y otros "
+"idiomas occidentales es ISO-8859-1."
+
+#: C/account-irc.page:141(item/title)
+#| msgid "Click <gui>Create</gui>."
+msgid "<gui>Servers</gui>"
+msgstr "<gui>Servidores</gui>"
 
-#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p)
+#: C/account-irc.page:142(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, click on the drop-down list at the "
-"top."
+"An IRC network may have many servers you can connect to. When you are "
+"connected to a server on a particular network, you can communicate with all "
+"users on all other servers on that network. You can add and remove servers "
+"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
 msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui>, pulse en la lista "
-"desplegable en la parte superior."
+"Una red IRC puede tener muchos servidores a los que se puede conectar. "
+"Cuando está conectado a un servidor en una red en particular, puede "
+"comunicarse con todos los usuarios en todos los servidores de esa red. Puede "
+"añadir y quitar servidores para esa red usando los botones <gui>Añadir</gui> "
+"y <gui>Quitar</gui>."
 
-#: C/set-custom-status.page:52(p)
+#: C/account-irc.page:147(item/p)
 msgid ""
-"Select the status you want to add a custom message to. You have to select "
-"the one identified with the label <gui>Custom Message</gui>."
+"When a server is selected, click the field under <gui>Server</gui> or "
+"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
+"to focus the field, and press the space bar to begin editing."
 msgstr ""
-"Seleccione el estado al que quiere añadir el mensaje personalizado. Tiene "
-"que seleccionar el identificado con la etiqueta <gui>Mensaje personalizado</"
-"gui>."
+"Cuando un servidor esté seleccionado, pulse el campo bajo <gui>Servidor</"
+"gui> o <gui>Puerto</gui> para editarlo. Alternativamente, use las flechas "
+"izquierda y derecha para dar el foco al campo y pulse la barra espaciadora "
+"para comenzar a editarlo."
 
-#: C/set-custom-status.page:58(p)
+#: C/account-irc.page:151(item/p)
 msgid ""
-"Enter your custom message in the text box at the top of the window, and "
-"press <key>Enter</key> to set the message."
+"Select the check box in the <gui>SSL</gui> column to encrypt all "
+"communication with a server. Note that this does not prevent other users on "
+"the network from seeing what you write on public chat rooms."
 msgstr ""
-"Introduzca su mensaje personalizado en la caja de texto en la parte superior "
-"de la ventana y pulse <key>Intro</key> para establecer el mensaje."
+"Seleccione la casilla de verificación en la columna <gui>SSL</gui> para "
+"cifrar toda la comunicación con el servidor. Note que esto no previene que "
+"otros usuarios en la red vean lo que escribe en salas de chat públicas."
+
+#: C/account-jabber.page:7(info/desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Opciones avanzadas para cuentas Jabber y Google Talk."
+
+#: C/account-jabber.page:29(page/title)
+msgid "Jabber account details"
+msgstr "Detalles de la cuenta Jabber"
 
-#: C/set-custom-status.page:64(p)
+#: C/account-jabber.page:31(page/p)
 msgid ""
-"If you want to set the custom message as a favorite, saving it in order to "
-"use it again, click on the little star on the right of the text box where "
-"you wrote your custom message."
+"Most Jabber accounts will require only a login ID and a password to connect. "
+"For some accounts or on certain types of networks, you may need to enter "
+"additional information in the <gui>Advanced</gui> section. Normally, you "
+"will not need to use the advanced options below. For general instructions on "
+"adding an account, see <link xref=\"add-account\"/>."
 msgstr ""
-"Si quiere establecer el mensaje personalizado como un favorito, guardándolo "
-"para usarlo de nuevo, pulse en la pequeña estrella a la derecha de la caja "
-"de texto donde escribió su mensaje personalizado."
+"La mayoría de cuentas Jabber, para conectarse, sólo requieren un ID de "
+"inicio de sesión y una contraseña. Para algunas cuentas en cierto tipo de "
+"redes, puede necesitar introducir información adicional en la sección "
+"<gui>Avanzadas</gui>. Generalmente no necesitará usar las opciones avanzadas "
+"de debajo. Consulte la <link xref=\"add-account\"/> para obtener "
+"instrucciones generales para añadir una cuenta."
 
-#: C/set-custom-status.page:69(p)
+#: C/account-jabber.page:39(note/p)
 msgid ""
-"If you do not do it, the custom message will not be available the next time "
-"you use <app>Empathy</app>. It will be saved only for the current session."
+"Google Talk is a type of Jabber account. These instructions hold for Google "
+"Talk accounts as well."
 msgstr ""
-"Si no lo hace el mensaje personalizado no estará disponible la próxima vez "
-"que use <app>Empathy</app>. Sólo se guardará durante la sesión actual."
-
-#: C/set-custom-status.page:78(title)
-msgid "Edit, remove and add a custom message"
-msgstr "Editar, quitar y añadir un mensaje personalizado"
+"Google Talk es un tipo de cuenta Jabber. Estas instrucciones también "
+"funcionan para cuentas de Google Talk."
 
-#: C/set-custom-status.page:88(p)
-msgid "Select <gui>Edit Custom Message</gui>."
-msgstr "Seleccione <gui>Editar mensaje personalizado</gui>."
+#: C/account-jabber.page:45(item/title)
+#| msgid "Encryption required (TLS/SSL)"
+msgid "<gui>Encryption required (TLS/SSL)</gui>"
+msgstr "<gui>Se requiere cifrado (TLS/SSL)</gui>"
 
-#: C/set-custom-status.page:95(p)
-msgid "To edit a custom message:"
-msgstr "Para editar un mensaje personalizado:"
+#: C/account-jabber.page:46(item/title)
+#| msgid "Ignore SSL certificate errors"
+msgid "<gui>Ignore SSL certificate errors</gui>"
+msgstr "<gui>Ignorar los errores de certificados SSL</gui>"
 
-#: C/set-custom-status.page:100(p)
+#: C/account-jabber.page:47(item/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"edit and double-click on it."
+"Whenever possible, communication between <app>Empathy</app> and the Jabber "
+"server is encrypted. If encrypted communication is not possible, messages "
+"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
+"<app>Empathy</app> from communicating with the Jabber server when encryption "
+"is not possible."
 msgstr ""
-"Desde la caja <gui>Estados guardados</gui>, seleccione el mensaje de estado "
-"que quiere editar y pulse dos veces sobre él."
+"Siempre que sea posible, la comunicación entre <app>Empathy</app> y el "
+"servidor Jabber está cifrada. Si la comunicación cifrada no es posible, "
+"puede que los mensajes se envíen sin cifrar. Seleccione <gui>Requiere "
+"cifrado</gui> para evitar que <app>Empathy</app> se comunique con el "
+"servidor Jabber cuando no es posible cifrar la comunicación."
 
-#: C/set-custom-status.page:106(p)
-msgid "Type the new custom message and press <key>Enter</key> to modify it."
+#: C/account-jabber.page:52(item/p)
+msgid ""
+"Some Jabber servers may encrypt data using invalid certificates, or using "
+"certificates from unknown authorities. If you trust the server you are "
+"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
+"allow encrypted communication with invalid certificates."
 msgstr ""
-"Escriba el mensaje personalizado nuevo y pulse <key>Intro</key> para "
-"modificarlo."
+"Algunos servidores Jabber pueden cifrar datos usando certificados no válidos "
+"o usando certificados de autoridades desconocidas. Si confía en el servidor "
+"al que se está conectando puede seleccionar <gui>Ignorar los errores de "
+"certificados SSL</gui> para permitir comunicaciones cifradas con "
+"certificados no válidos."
 
-#: C/set-custom-status.page:113(p)
-msgid "To remove a custom message:"
-msgstr "Para quitar un mensaje personalizado:"
+#: C/account-jabber.page:59(item/title)
+#| msgid "Click <gui>Create</gui>."
+msgid "<gui>Resource</gui>"
+msgstr "<gui>Recurso</gui>"
 
-#: C/set-custom-status.page:118(p)
+#: C/account-jabber.page:60(item/title)
+#| msgid "Click <gui>Create</gui>."
+msgid "<gui>Priority</gui>"
+msgstr "<gui>Prioridad</gui>"
+
+#: C/account-jabber.page:61(item/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"remove."
+"If you have multiple applications (for instance, on separate computers) "
+"connected to your account at the same time, you can set a resource to "
+"uniquely identify each one. By default, <app>Empathy</app> will use "
+"<input>Telepathy</input> as the resource."
 msgstr ""
-"Desde la caja <gui>Estados guardados</gui>, seleccione el mensaje de estado "
-"que quiere quitar."
-
-#: C/set-custom-status.page:124(p)
-msgid "Click on the <gui>Remove</gui> button."
-msgstr "Pulse el botón <gui>Quitar</gui>."
+"Si tiene múltiples aplicaciones (en equipos diferentes, por ejemplo) "
+"conectados a su cuenta al mismo tiempo, puede configurar un recurso para "
+"identificar unívocamente cada una. De forma predeterminada <app>Empathy</"
+"app> usará <input>Telepathy</input> como recurso."
 
-#: C/set-custom-status.page:131(p)
+#: C/account-jabber.page:65(item/p)
 msgid ""
-"To add a new custom message, from the <gui>Add New Preset</gui> section:"
+"You can set the priority to specify which application should receive "
+"incoming messages from your contacts. New messages will be sent to the "
+"application with the highest priority."
 msgstr ""
-"Para añadir un mensaje personalizado nuevo, desde la sección <gui>Añadir "
-"estado guardado</gui> "
+"Puede establecer la prioridad para especificar qué aplicación debería "
+"recibir mensajes entrantes de sus contactos. Los mensajes nuevos se enviarán "
+"a la aplicación con la prioridad más alta."
+
+#: C/account-jabber.page:70(item/title)
+#| msgid "Override server settings"
+msgid "<gui>Override server settings</gui>"
+msgstr "<gui>Sobreescribir los ajustes del servidor</gui>"
 
-#: C/set-custom-status.page:136(p)
+#: C/account-jabber.page:71(item/p)
 msgid ""
-"Click on the drop-down list to select the status you want to set a custom "
-"message to."
+"<app>Empathy</app> will use default settings to connect to the Jabber server "
+"based on your login ID. For some Jabber servers, you will need to enter "
+"custom server settings manually. These settings should be provided for you "
+"by your Jabber provider."
 msgstr ""
-"Pulse en la lista desplegable para seleccionar el estado en el que quiere "
-"establecer un mensaje personalizado."
-
-#: C/set-custom-status.page:142(p)
-msgid "Click on the text box, and type the new custom message."
-msgstr "Pulse en la caja de texto y escriba el mensaje personalizado nuevo."
+"<app>Empathy</app> usará la configuración predeterminada para conectarse al "
+"servidor Jabber en función de su ID de inicio de sesión. Para algunos "
+"servidores Jabber necesitará introducir manualmente ajustes de servidor. Su "
+"proveedor Jabber deberá proporcionar esos ajustes."
 
-#: C/set-custom-status.page:147(p)
-msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
-msgstr "Pulse <gui>Añadir</gui> para añadir un mensaje nuevo a los guardados."
+#: C/accounts-window.page:11(info/desc)
+msgid "Add, modify, and delete accounts."
+msgstr "Añadir, modificar y borrar cuentas."
 
-#: C/set-custom-status.page:156(p)
-msgid "When finished, click on <gui>Close</gui>."
-msgstr "Cuando haya terminado pulse <gui>Cerrar</gui>."
+#: C/accounts-window.page:33(page/title)
+msgid "Accounts Window"
+msgstr "Ventana de cuentas"
 
-#: C/set-custom-status.page:163(p)
+#: C/accounts-window.page:35(page/p)
 msgid ""
-"When you edit or add a new custom message, it will not be set as the current "
-"status message. You will need to select it from the <gui>Contact List</gui> "
-"window."
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
 msgstr ""
-"Cuando edita o añade un mensaje personalizado nuevo no se establece como el "
-"mensaje de estado actual. Tiene que seleccionarlo en la ventana de "
-"<gui>Lista de contactos</gui>."
+"La ventana <gui>Cuentas</gui> le permite añadir, modificar y eliminar "
+"cuentas."
 
-#: C/send-message.page:8(desc)
-msgid "Send a message to one of your contacts."
-msgstr "Enviar un mensaje a uno de sus contactos."
+#: C/accounts-window.page:43(section/title)
+msgid "Account Details"
+msgstr "Detalles de la cuenta"
 
-#: C/send-message.page:17(name) C/send-file.page:17(name)
-#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:15(name)
-#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:15(name)
-#: C/change-status.page:24(name) C/add-contact.page:18(name)
-msgid "Phil Bull"
-msgstr "Phil Bull"
+#: C/accounts-window.page:44(section/p)
+msgid ""
+"For most types of accounts, you can simply enter a login ID and a password. "
+"Certain accounts or account types, however, may require additional "
+"information."
+msgstr ""
+"Para la mayoría de los tipos de cuenta puede, simplemente, introducir un ID "
+"de inicio de sesión y una contraseña. No obstante, algunos tipos de cuenta "
+"pueden requerir información adicional."
 
-#: C/send-message.page:18(email) C/send-file.page:18(email)
-#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:16(email)
-#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:16(email)
-#: C/change-status.page:25(email) C/add-contact.page:19(email)
-msgid "philbull@gmail.com"
-msgstr "philbull@gmail.com"
+#: C/add-account.page:9(info/desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Añadir una cuenta nueva en <app>Empathy</app>."
 
-#: C/send-message.page:32(title)
-msgid "Send a message to someone"
-msgstr "Enviar un mensaje a alguien"
+#: C/add-account.page:40(page/title)
+msgid "Add a new account"
+msgstr "Añadir una cuenta nueva"
 
-#: C/send-message.page:36(p)
+#: C/add-account.page:42(page/p)
 msgid ""
-"From the <gui>Contact List</gui> window, double-click the name of the "
-"contact that you want to have a conversation with."
+"You can add instant messaging accounts from any supported service to "
+"communicate with all of your contacts in <app>Empathy</app>. For some "
+"account providers, these steps will also allow you to register for a new "
+"account. For more details, see <link xref=\"create-account\"/>."
 msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui> pulse dos veces sobre el "
-"nombre del contacto con el que quiere tener una conversación."
+"Puede añadir cuentas de mensajería instantánea de cualquier servicio "
+"soportado para comunicarse con todos sus contactos desde <app>Empathy</app>. "
+"Para algunos proveedores de cuentas estos pasos le permitirán registrar una "
+"cuenta nueva. Para obtener más detalles consulte la <link xref=\"create-"
+"account\"/>."
 
-#: C/send-message.page:42(p)
+#: C/add-account.page:49(item/p) C/disable-account.page:49(item/p)
+#: C/irc-nick-password.page:50(item/p) C/remove-account.page:43(item/p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
+#| "gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
 msgid ""
-"A new window will open. Type a message into the box at the bottom of the "
-"window and press <key>Enter</key> to send it."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</gui> "
+"<gui>Accounts</gui></guiseq>, or press <key>F4</key>."
 msgstr ""
-"Se abrirá una ventana nueva. Cuando se establezca la conexión, verá la "
-"ventana de charla en la parte inferior de la ventana, <key>Intro</key> y el "
-"tiempo total de conversación."
+"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Editar</"
+"gui><gui>Cuentas</gui></guiseq> o pulse <key>F4</key>."
 
-#: C/send-message.page:50(title)
-msgid "Send a message to a meta-contact"
-msgstr "Enviar un mensaje a un metacontacto"
+#: C/add-account.page:53(item/p)
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "Pulse <gui style=\"button\">+</gui>."
 
-#: C/send-message.page:58(p)
+#: C/add-account.page:58(item/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Chat</gui>."
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
+"wish to add."
 msgstr ""
-"Seleccione el contacto con el que quiere tener la conversación y, del menú, "
-"seleccione <gui style=\"menuitem\">Chat</gui>."
-
-#: C/send-file.page:8(desc)
-msgid "Send a file from your computer to one of your contacts."
-msgstr "Enviar un archivo desde su equipo a uno de sus contactos."
-
-#: C/send-file.page:36(title)
-msgid "Send files"
-msgstr "Enviar archivos"
+"Desde la lista desplegable <gui>Protocolo</gui> seleccione el tipo de cuenta "
+"que quiere añadir."
 
-#: C/send-file.page:40(p) C/favorite-rooms.page:66(p)
-msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+#: C/add-account.page:62(item/p)
+msgid ""
+"If you do not already have a registered account, select <gui>Create a new "
+"account on the server</gui>. This feature is not available for all account "
+"types, and may not work with some account providers. See <link xref=\"create-"
+"account\"/> for more information."
 msgstr ""
-"En la ventana de la <gui>Lista de contactos</gui> realice una de las "
-"siguientes acciones:"
+"Si aún no tiene una cuenta registrada seleccione <gui>Crear una cuenta nueva "
+"en el servidor</gui>. Esta característica no está disponible para todos los "
+"tipos de cuentas y puede no funcionar con algunos proveedores de cuentas. "
+"Para obtener más información consulte la <link xref=\"create-account\"/>."
 
-#: C/send-file.page:45(p)
+#: C/add-account.page:69(item/p)
 msgid ""
-"Right click on the contact you want to send a file to, and choose <gui>Send "
-"file</gui>."
+"Enter the required information. For most accounts, you will only need a "
+"login ID and a password. Some accounts may require additional information. "
+"See <link xref=\"accounts-window#details\"/>for more information."
 msgstr ""
-"Pulse con el botón derecho sobre el contacto al que quiere enviar un archivo "
-"y seleccione <gui>Enviar archivo</gui>."
+"Introduzca la información requerida. Para la mayoría de cuentas sólo "
+"necesitará un ID de inicio de sesión y una contraseña. Algunas cuentas "
+"pueden requerir información adicional. Para obtener más información consulte "
+"la <link xref=\"accounts-window#details\"/>."
 
-#: C/send-file.page:50(p)
+#: C/add-account.page:74(item/p) C/import-account.page:61(item/p)
+#: C/irc-nick-password.page:63(item/p)
+msgid "Click <gui style=\"button\">Apply</gui>."
+msgstr "Pulse <gui style=\"button\">Aplicar</gui>."
+
+#: C/add-account.page:81(note/p)
 msgid ""
-"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
-"gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
+"To change the name that identifies the account in the <gui>Accounts</gui> "
+"window, select the account from the list on the left and either click on the "
+"name or press the space bar. Edit the account name and press <key>Enter</"
+"key> when you’re finished."
 msgstr ""
-"Pulse sobre el contacto al que quiere enviar un archivo y elija "
-"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Enviar archivo</gui></"
-"guiseq>."
+"Para cambiar el nombre que identifica la cuenta en la ventana <gui>Cuentas</"
+"gui>, seleccione la cuenta de la lista a la izquierda y pulse en el nombre o "
+"la barra espaciadora. Edite el nombre de la cuenta y pulse <key>Intro</key> "
+"cuando haya acabado."
 
-#: C/send-file.page:58(p)
-msgid "Select the file to send, and click on <gui>Send</gui>."
-msgstr "Seleccione el archivo para enviar y pulse <gui>Enviar</gui>."
+#: C/add-contact.page:9(info/desc)
+msgid "Add someone to the contact list."
+msgstr "Añadir alguien a la lista de contactos."
 
-#: C/send-file.page:63(p)
-msgid "The <gui>File Transfers</gui> window will appear."
-msgstr "Aparecerá la ventana <gui>Transferencias de archivos</gui>."
+#: C/add-contact.page:18(credit/name) C/change-status.page:24(credit/name)
+#: C/prob-conn-acctdisabled.page:15(credit/name)
+#: C/prob-conn-auth.page:17(credit/name)
+#: C/prob-conn-neterror.page:15(credit/name) C/prob-conn.page:14(credit/name)
+#: C/send-file.page:17(credit/name) C/send-message.page:17(credit/name)
+msgid "Phil Bull"
+msgstr "Phil Bull"
 
-#: C/send-file.page:66(p)
+#: C/add-contact.page:33(page/title)
+msgid "Add someone to your list of contacts"
+msgstr "Añadir alguien a su lista de contactos"
+
+#: C/add-contact.page:37(item/p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr "Elija <guiseq><gui>Chat</gui><gui>Añadir contacto</gui></guiseq>."
+
+#: C/add-contact.page:40(item/p)
 msgid ""
-"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
-"to halt the transfer."
+"From the <gui>Account</gui> drop-down list, select the account you wish to "
+"use to connect to your contact. Your contact will need to be using the same "
+"service as the account you select."
 msgstr ""
-"Espere a que su contacto acepte la transferencia de archivo o pulse "
-"<gui>Detener</gui> para detener la transferencia."
+"Desde la lista desplegable <gui>Cuenta</gui> seleccione la cuenta que quiere "
+"usar para conectar con su contacto. Su contacto deberá usar el mismo "
+"servicio que la cuenta que esté seleccionando."
 
-#: C/send-file.page:72(p)
+#: C/add-contact.page:45(item/p)
 msgid ""
-"Once the transfer is finished, it is possible to close the <gui>File "
-"Transfers</gui> window."
+"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
+"screen name, or other appropriate identifier for the service type."
 msgstr ""
-"Una vez que la transferencia haya finalizado, es posible cerrar la ventana "
-"<gui>Transferencias de archivos</gui>."
+"En el campo <gui>Identificador</gui> introduzca el ID de inicio de sesión de "
+"su contacto, su nombre en pantalla u otro identificador apropiado para el "
+"tipo de servicio."
 
-#: C/send-file.page:80(p)
+#: C/add-contact.page:49(item/p)
 msgid ""
-"If you have multiple finished transfers listed in the window, click on "
-"<gui>Clear</gui> to empty the list. This will only remove the files from the "
-"list and will not delete them from your computer."
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
+"to appear in your contact list."
 msgstr ""
-"Si tiene múltiples transferencias finalizadas listas en la ventana pulse "
-"<gui>Limpiar</gui> para vaciar la lista. Esto sólo quitará los archivos de "
-"la lista y no los borrará de su equipo."
+"En el campo <gui>Apodo</gui> escriba el nombre de su contacto tal y como le "
+"gustaría que apareciese en su lista de contactos."
 
-#: C/send-file.page:87(p)
-msgid ""
-"It is possible to send files only using the following services: <em>Jabber</"
-"em>, <em>Google Talk</em> and <em>People Nearby</em>."
+#: C/add-contact.page:53(item/p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
 msgstr ""
-"Sólo es posible enviar archivos usando los siguientes servicios: <em>Jabber</"
-"em>, <em>Google Talk</em> y <em>Gente cerca</em>."
+"Pulse <gui>Añadir</gui> para añadir la persona a su lista de contactos."
 
-#: C/send-file.page:93(p)
+#: C/add-contact.page:61(note/p)
 msgid ""
-"In order to send a file to someone, you need to be connected to the "
-"Internet, or to a local area network."
+"To add a new person to your list of contacts, you need to be connected to "
+"the Internet and to your account."
 msgstr ""
-"Para poder enviar un archivo a alguien necesita estar conectado a Internet o "
-"a una red de área local."
+"Para añadir una persona nueva a su lista de contactos necesita estar "
+"conectado a Internet y a su cuenta."
 
-#: C/salut-protocol.page:8(desc)
-msgid "Understanding the People Nearby feature."
-msgstr "Entender la característica Gente cerca."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/audio-call.page:36(media) C/audio-video.page:70(media)
+#: C/video-call.page:39(media)
+#| msgid ""
+#| "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+msgctxt "_"
+msgid ""
+"external ref='figures/camera-web.png' md5='8166b4372f25b78cbf5a64fe2eac2ce5'"
+msgstr ""
+"external ref='figures/camera-web.png' md5='8166b4372f25b78cbf5a64fe2eac2ce5'"
 
-#: C/salut-protocol.page:33(title)
-msgid "What is People Nearby?"
-msgstr "¿Qué es Gente cerca?"
+#: C/audio-call.page:9(info/desc)
+msgid "Call your contacts over the Internet."
+msgstr "Llamar a sus contactos a través de Internet."
 
-#: C/salut-protocol.page:37(p)
-msgid "I'd like to see this played up a bit more."
-msgstr "Me gustaría ver esto explicado un poco más."
+#: C/audio-call.page:27(page/title)
+msgid "Start an audio conversation"
+msgstr "Iniciar una conversación de sonido"
 
-#: C/salut-protocol.page:40(p)
+#: C/audio-call.page:29(page/p)
 msgid ""
-"The People Nearby service is a serverless communication service: you do not "
-"need to connect and authenticate to a central server in order to use it."
+"You can call your contacts and have an audio conversation with them. This "
+"features only works with certain types of accounts, and it requires the "
+"other person to have an application that supports audio calls."
 msgstr ""
-"El servicio Gente cerca es un servicio de comunicación sin servidores: no "
-"necesita conectarse y autenticarse contra un servidor central para poder "
-"usarlo."
+"Puede llamar a sus contactos y tener conversaciones de sonido con ellos. "
+"Esta característica sólo funciona con cierto tipo de cuentas y requiere que "
+"la otra persona tenga una aplicación que soporte llamadas de sonido."
 
-#: C/salut-protocol.page:45(p)
+#: C/audio-call.page:34(item/p)
 msgid ""
-"This kind of serverless messaging system is restricted to a local area "
-"network and an active Internet connection is not necessary."
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+"next to the name of the contact you wish to call and choose <gui style="
+"\"menuitem\">Audio Call</gui>."
 msgstr ""
-"Este tipo de sistemas de mensajería sin servidores está restringido a redes "
-"de área local y no se necesita una conexión activa con Internet."
+"Desde la ventana <gui>Lista de contactos</gui> pulse el icono de <media type="
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">videollamada</"
+"media> junto al nombre del contacto al que desea llamar y seleccione <gui "
+"style=\"menuitem\">Llamada de voz</gui>."
 
-#: C/salut-protocol.page:49(p)
+#: C/audio-call.page:42(item/p) C/video-call.page:44(item/p)
 msgid ""
-"The people that use this service inside the same local area network will be "
-"auto-discovered, and it will be possible to send them messages and files as "
-"with other services."
+"A new window will open. When the connection is established, you will see "
+"<gui>Connected</gui> at the bottom of the window, along with the total "
+"conversation time."
 msgstr ""
-"La gente que usa este servicio dentro de la misma red de área local se "
-"autodescubrirá y será posible enviarles mensajes y archivos al igual que con "
-"otros servicios."
+"Se abrirá una ventana nueva. Cuando se establezca la conexión, verá escrito, "
+"en la parte inferior de la ventana, <gui>Connectado</gui> y el tiempo total "
+"de conversación."
 
-#: C/salut-protocol.page:54(p)
-msgid ""
-"All the modern local area networks should be able to support this kind of "
-"service."
+#: C/audio-call.page:48(item/p) C/video-call.page:49(item/p)
+msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgstr ""
-"Todas las redes modernas de área local deberían poder soportar este tipo de "
-"servicio."
+"Para finalizar una conversación pulse <gui style=\"button\">Colgar</gui>."
 
-#: C/remove-account.page:8(desc)
-msgid "Completely remove an account from <app>Empathy</app>."
-msgstr "Quitar completamente una cuenta en <app>Empathy</app>."
+#: C/audio-call.page:55(note/p)
+#| msgid ""
+#| "To turn an audio conversation into a video conversation, choose "
+#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</"
+#| "gui></guiseq>."
+msgid ""
+"To turn an audio conversation into a video conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui> <gui style=\"menuitem\">Video On</gui></guiseq>."
+msgstr ""
+"Para convertir una conversación de sonido en una de vídeo, elija "
+"<guiseq><gui style=\"menu\">Vídeo</gui><gui style=\"menuitem\">Vídeo "
+"encendido</gui></guiseq>."
 
-#: C/remove-account.page:34(title)
-msgid "Remove an account"
-msgstr "Quitar una cuenta"
+#: C/audio-call.page:63(section/title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Iniciar una conversación con un metacontacto"
 
-#: C/remove-account.page:36(p)
+#: C/audio-call.page:66(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:64(item/p)
 msgid ""
-"You can completely remove an account from <app>Empathy</app> if you no "
-"longer wish to use the account. If you wish to use the account in "
-"<app>Empathy</app> again in the future, you will have to add your account "
-"details again."
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
 msgstr ""
-"Puede quitar completamente una cuenta de <app>Empathy</app> si no quiere "
-"seguir usándola. Si quiere usar de nuevo la cuenta en <app>Empathy</app> en "
-"el futuro, deberá añadir los detalles de la cuenta de nuevo."
+"Desde la ventana <gui>Lista de contactos</gui>, pulse con el botón derecho "
+"sobre el metacontacto."
 
-#: C/remove-account.page:43(p) C/irc-nick-password.page:50(p)
-#: C/disable-account.page:49(p) C/add-account.page:49(p)
+#: C/audio-call.page:71(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
-"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
 msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Editar</"
-"gui><gui>Cuentas</gui></guiseq> o pulse <key>F4</key>."
+"Seleccione el contacto con el que quiere tener la conversación y, del menú, "
+"seleccione <gui style=\"menuitem\">Llamada de voz</gui>."
 
-#: C/remove-account.page:47(p)
+#: C/audio-call.page:78(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:76(note/p)
 msgid ""
-"Select the account you wish to remove from the accounts list on the left "
-"side of the window."
+"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
+"contact in the <gui>Contact List</gui> window, and stop over it for a "
+"second: a small pop-up message will appear showing the number of the "
+"contacts that form the meta-contact."
 msgstr ""
-"Seleccione la cuenta que quiere quitar de la lista de cuentas en la parte "
-"izquierda de la ventana."
-
-#: C/remove-account.page:51(p)
-#| msgid "Click <gui style=\"button\">Add</gui>."
-msgid "Click <gui style=\"button\">-</gui>."
-msgstr "Pulse <gui style=\"button\">-</gui>."
+"Para reconocer si un contecto es un <em>metacontacto</em>, mueva su ratón "
+"sobre un contacto en la ventana de la <gui>Lista de contactos</gui> y "
+"deténgalo encima un segundo: aparecerá un pequeño mensaje emergente "
+"mostrando el número de contactos que forman el metacontacto."
 
-#: C/remove-account.page:54(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/audio-video.page:58(media)
+#| msgid ""
+#| "@@image: 'figures/audio-input-microphone.png'; "
+#| "md5=8d89026b66a263a3bc5b1f0665948567"
+msgctxt "_"
 msgid ""
-"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
-"button to permanently remove the account."
+"external ref='figures/audio-input-microphone.png' "
+"md5='8d89026b66a263a3bc5b1f0665948567'"
 msgstr ""
-"Se mostrará un diálogo preguntando por una confirmación. Pulse el botón "
-"<gui>Quitar</gui> para quitar la cuenta permanentemente."
+"external ref='figures/audio-input-microphone.png' "
+"md5='8d89026b66a263a3bc5b1f0665948567'"
 
-#: C/remove-account.page:60(p)
+#: C/audio-video.page:8(info/desc)
 msgid ""
-"Even after removing an account, <app>Empathy</app> does not delete your "
-"conversation history for that account."
+"Information on when it is possible to have an audio or video conversation."
 msgstr ""
-"Incluso después de quitar una cuenta, <app>Empathy</app> no borra su "
-"histórico de conversaciones para esa cuenta."
+"Información acerca de cuándo es posible tener una conversación de vídeo o "
+"sonido."
 
-#: C/prob-conn.page:7(desc)
-msgid "Diagnose common problems connecting to an instant messaging service."
+#: C/audio-video.page:32(page/title)
+msgid "Audio and video support"
+msgstr "Soporte de sonido y vídeo"
+
+#: C/audio-video.page:34(page/p)
+msgid ""
+"You can only have audio and video conversation with contacts who are using "
+"an application which also supports this feature. When your contacts support "
+"audio or video conversations, you will see the following icons next to their "
+"names in the contact list:"
 msgstr ""
-"Diagnosticar problemas comunes al conectarse a un servicio de mensajería "
-"instantánea."
+"Sólo puede tener conversaciones de sonido y vídeo con contactos que estén "
+"usando una aplicación que también soporte la característica. Cuando las "
+"aplicaciones de sus contactos soportan conversaciones de sonido o vídeo lo "
+"verá en forma de iconos junto a sus nombres, en la lista de contactos:"
 
-#: C/prob-conn.page:29(title)
-msgid "Problems connecting to an instant messaging service"
-msgstr "Problemas al conectarse a un servicio de mensajería instantánea"
+#: C/audio-video.page:43(td/p)
+msgid "Icon"
+msgstr "Icono"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/prob-conn-neterror.page:59(None) C/prob-conn-name.page:44(None)
-#: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None)
-msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
-msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+#: C/audio-video.page:48(td/p)
+msgid "Description"
+msgstr "Descripción"
 
-#: C/prob-conn-neterror.page:7(desc)
+#: C/audio-video.page:57(td/p)
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"An error message which says “<gui>Network error</gui>� appears in the main "
-"window."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-"
+"microphone.png\"> Icon for audio conversation </media>"
 msgstr ""
-"Aparecerá el mensaje de error «<gui>Error de red</gui>» en la ventana "
-"principal."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-"
+"microphone.png\"> Icono para conversación de sonido </media>"
 
-#: C/prob-conn-neterror.page:34(title)
-msgid "I get a message that says “Network error�"
-msgstr "Obtengo un mensaje que muestra «Error de red»"
-
-#: C/prob-conn-neterror.page:37(cite)
-msgid "shaunm"
-msgstr "shaunm"
+#: C/audio-video.page:64(td/p)
+msgid "The contact is able to have an audio conversation."
+msgstr "El contacto puede tener conversaciones de sonido."
 
-#: C/prob-conn-neterror.page:38(p)
+#: C/audio-video.page:69(td/p)
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"Empathy no longer allows you to create an IRC account without a valid nick. "
-"I've removed the guide link. Remove the text."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> "
+"Icon for video conversation </media>"
 msgstr ""
-"Empathy ya no le permite crear una cuenta de IRC sin un apodo válido. Se ha "
-"quitado el enlace de guía. Quitar el texto."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> "
+"Icono para conversación de vídeo </media>"
+
+#: C/audio-video.page:76(td/p)
+msgid "The contact is able to have a video conversation."
+msgstr "El contacto puede tener conversaciones de vídeo."
 
-#: C/prob-conn-neterror.page:42(p)
+#: C/audio-video.page:83(note/p)
 msgid ""
-"This kind of error happens when <app>Empathy</app> cannot communicate with "
-"the instant messaging service for some reason."
+"In order to have an audio conversation, you need to have a sound card that "
+"is supported by your operating system, and a working microphone."
 msgstr ""
-"Este tipo de mensaje sucede cuando <app>Empathy</app> no se puede comunicar "
-"con el servicio de mensajería instantánea por alguna razón."
+"Para poder tener una conversación de sonido debe tener una tarjeta de sonido "
+"soportada por el sistema operativo y un micrófono que funcione."
 
-#: C/prob-conn-neterror.page:46(p)
+#: C/audio-video.page:87(note/p)
 msgid ""
-"Also, this kind of error happens when you try to use an IRC account without "
-"setting a nickname."
+"In order to have a video conversation, you need to have a webcam that is "
+"supported by your operating system, and a working microphone."
 msgstr ""
-"Este tipo de error también sucede cuando intenta usar una cuenta de IRC sin "
-"haber configurado el apodo."
+"Para poder tener una conversación de vídeo debe tener una cámara web "
+"soportada por el sistema operativo y un micrófono que funcione."
 
-#: C/prob-conn-neterror.page:53(p) C/prob-conn-auth.page:45(p)
-#: C/prob-conn-acctdisabled.page:44(p)
-msgid ""
-"Make sure that you are connected to the Internet, or to a local area network."
-msgstr "Asegúrese de que está conectado a Internet o a una red de área local."
+#: C/audio-video.page:95(section/title)
+msgid "Supported Account Types"
+msgstr "Tipos de cuentas soportadas"
 
-#: C/prob-conn-neterror.page:58(p) C/prob-conn-name.page:43(p)
-#: C/prob-conn-auth.page:57(p)
+#: C/audio-video.page:97(section/p)
 msgid ""
-"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
-"\">edit</media> icon in the error message."
+"You can only have audio and video conversations using accounts on certain "
+"supported services. The following table lists whether audio and video is "
+"supported for each type of account."
 msgstr ""
-"Pulse el icono <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-"
-"edit.png\">Editar</media> en el mensaje de error."
+"Sólo puede tener conversaciones de sonido y vídeo usando cuentas en ciertos "
+"servicios soportados. La siguiente tabla lista si el sonido y vídeo está "
+"soportado para cada tipo de cuenta."
 
-#: C/prob-conn-neterror.page:64(p) C/prob-conn-acctdisabled.page:60(p)
+#: C/audio-video.page:102(note/p)
 msgid ""
-"Check in the <gui>Advanced</gui> section that all the details are correct. "
-"You should be able to find these details from the website of the messaging "
-"service."
+"Account types are provided by plugins. Your system may not have all of the "
+"following types available, or it may have types not listed here. Updated "
+"plugins may make audio or video conversations possible on account types that "
+"are listed as unsupported here."
 msgstr ""
-"Expanda la sección <gui>Avanzadas</gui> y asegúrese de que los detalles son "
-"correctos. Debería poder encontrar estos detalles en la página web del "
-"servicio de mensajería."
+"Los complementos proporcionan los tipos de cuentas. Puede que su sistema no "
+"tenga disponible todos los siguientes tipos, o puede tener tipos no listados "
+"aquí. Las actualizaciones de complementos pueden hacer posibles "
+"conversaciones de sonido o vídeo en tipos de cuentas que aquí se muestran "
+"como no soportadas."
 
-#: C/prob-conn-neterror.page:79(p) C/prob-conn-name.page:65(p)
-msgid ""
-"Switch the account off, and then switch it on to try to reconnect to the "
-"service."
-msgstr ""
-"Salga de la cuenta y vuelva a entrar para volver a conectarse al servicio."
+#: C/audio-video.page:128(td/p)
+msgid "Service"
+msgstr "Servicio"
 
-#: C/prob-conn-neterror.page:87(title)
-msgid "Proxy support"
-msgstr "Soporte de proxy"
+#: C/audio-video.page:129(td/p)
+msgid "Audio"
+msgstr "Sonido"
 
-#: C/prob-conn-neterror.page:88(p)
-msgid ""
-"At the moment <app>Empathy</app> can not be configured to work with a proxy."
-msgstr ""
-"Por el momento <app>Empathy</app> no se puede configurar para que funcione "
-"con un proxy."
+#: C/audio-video.page:130(td/p)
+msgid "Video"
+msgstr "Vídeo"
 
-#: C/prob-conn-name.page:9(title)
-msgid "“Name in use�"
-msgstr "«Nombre en uso»"
+#: C/audio-video.page:135(td/p)
+msgid "AIM"
+msgstr "AIM"
 
-#: C/prob-conn-name.page:10(desc)
-msgid ""
-"An error message which says “<gui>Name in use</gui>� appears in the main "
-"window."
-msgstr ""
-"Aparecen en la ventana principal un mensaje de error que dice «<gui>Nombre en "
-"uso</gui>»."
+#: C/audio-video.page:136(td/p) C/audio-video.page:137(td/p)
+#: C/audio-video.page:141(td/p) C/audio-video.page:142(td/p)
+#: C/audio-video.page:146(td/p) C/audio-video.page:147(td/p)
+#: C/audio-video.page:156(td/p) C/audio-video.page:157(td/p)
+#: C/audio-video.page:161(td/p) C/audio-video.page:162(td/p)
+#: C/audio-video.page:166(td/p) C/audio-video.page:167(td/p)
+#: C/audio-video.page:181(td/p) C/audio-video.page:182(td/p)
+#: C/audio-video.page:186(td/p) C/audio-video.page:187(td/p)
+#: C/audio-video.page:191(td/p) C/audio-video.page:192(td/p)
+#: C/audio-video.page:196(td/p) C/audio-video.page:197(td/p)
+#: C/audio-video.page:201(td/p) C/audio-video.page:202(td/p)
+#: C/audio-video.page:211(td/p) C/audio-video.page:212(td/p)
+#: C/audio-video.page:216(td/p) C/audio-video.page:217(td/p)
+msgid "No"
+msgstr "No"
 
-#: C/prob-conn-name.page:33(title)
-msgid "I get a message that says “Name in use�"
-msgstr "Obtengo un mensaje de error que muestra «Nombre en uso»"
+#: C/audio-video.page:140(td/p)
+msgid "Facebook Chat"
+msgstr "Chat de Facebook"
 
-#: C/prob-conn-name.page:35(p)
-msgid ""
-"This kind of error happens when you try to connect to your IRC account and "
-"you are using a nickname that is already being used by someone else on that "
-"particular network."
-msgstr ""
-"Este tipo de error sucede cuando intenta conectarse a su cuenta de IRC y "
-"está usando un apodo que ya está usando otra persona en esa red en "
-"particular."
+#: C/audio-video.page:145(td/p)
+msgid "gadugadu"
+msgstr "gadugadu"
 
-#: C/prob-conn-name.page:51(p)
-msgid "In the <gui>Nickname</gui> text box, type a new nickname."
-msgstr "En la caja de texto <gui>Apodo</gui> escriba un apodo nuevo."
+#: C/audio-video.page:150(td/p)
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: C/prob-conn-name.page:56(p)
-msgid ""
-"If you have registered that nickname within the network you are using, set "
-"the password for that nickname. For more information, see <link xref=\"irc-"
-"nick-password\"/>."
-msgstr ""
-"Si ha registrado ese apodo en la red que está usando, establezca la "
-"contraseña para ese apodo. Para obtener más información consulte la <link "
-"xref=\"irc-nick-password\"/>."
+#: C/audio-video.page:151(td/p) C/audio-video.page:152(td/p)
+#: C/audio-video.page:171(td/p) C/audio-video.page:172(td/p)
+#: C/audio-video.page:176(td/p) C/audio-video.page:177(td/p)
+#: C/audio-video.page:206(td/p) C/audio-video.page:207(td/p)
+msgid "Yes"
+msgstr "Sí"
 
-#: C/prob-conn-auth.page:8(desc)
-msgid ""
-"An error message which says “<gui>Authentication failed</gui>� appears in "
-"the main window."
-msgstr ""
-"Aparece un mensaje de error en la ventana principal que muestra «<gui>Falló "
-"la autenticación</gui>»."
+#: C/audio-video.page:155(td/p)
+msgid "Groupwise"
+msgstr "Groupwise"
 
-#: C/prob-conn-auth.page:36(title)
-msgid "I get a message that says “Authentication failed�"
-msgstr "Obtengo un mensaje que dice «Falló la autenticación»"
+#: C/audio-video.page:160(td/p)
+msgid "ICQ"
+msgstr "ICQ"
 
-#: C/prob-conn-auth.page:38(p)
-msgid ""
-"This kind of error happens when your instant messaging service is not "
-"allowing you to connect because it does not recognize your username or "
-"password for some reason."
-msgstr ""
-"Este tipo de error sucede cuando su servicio de mensajería instantánea no le "
-"está permitiendo conectar porque por alguna razón no reconoce su nombre de "
-"usuario o contraseña."
+#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+msgid "IRC"
+msgstr "IRC"
 
-#: C/prob-conn-auth.page:50(p)
-msgid ""
-"Make sure that you have registered an account with the service you are "
-"trying to connect to. If you do not have an account, most services will not "
-"allow you to connect."
-msgstr ""
-"Asegúrese de que ha registrado una cuenta con el servicio al que está "
-"intentando conectarse. Si no tiene una cuenta la mayoría de los servicios no "
-"le permitirán que se conecte."
+#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title)
+msgid "Jabber"
+msgstr "Jabber"
 
-#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:55(p)
-msgid ""
-"Type your username and password again to make sure that they are correct."
-msgstr ""
-"Escriba su nombre de usuario y contraseña de nuevo y asegúrese de que son "
-"correctos."
+#: C/audio-video.page:175(td/p)
+msgid "MSN"
+msgstr "MSN"
 
-#: C/prob-conn-auth.page:68(p)
-msgid ""
-"Deselect the <gui>Enabled</gui>, and then select it again to try to "
-"reconnect to the service."
-msgstr ""
-"Deseleccione la casilla de verificación <gui>Activada</gui> y después "
-"selecciónela de nuevo para intentar reconectar con el servicio."
+#: C/audio-video.page:180(td/p)
+msgid "myspace"
+msgstr "myspace"
 
-#: C/prob-conn-acctdisabled.page:7(desc)
-msgid ""
-"The instant messaging account that you want to use is not enabled in the "
-"list of accounts."
-msgstr ""
-"La cuenta de mensajería instantánea que quiere usar no está activada en la "
-"lista de cuentas."
+#: C/audio-video.page:185(td/p)
+msgid "qq"
+msgstr "qq"
 
-#: C/prob-conn-acctdisabled.page:34(title)
-msgid "My account is not enabled"
-msgstr "Mi cuenta no está activada"
+#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+msgid "People Nearby"
+msgstr "Gente cerca"
 
-#: C/prob-conn-acctdisabled.page:36(p)
-msgid ""
-"If the instant messaging account that you want to use is not enabled in the "
-"drop-down account list when you try to start a new conversation or join a "
-"room, your account details may not be correct."
-msgstr ""
-"Si la cuenta de mensajería instantánea que quiere usar no está activada en "
-"la lista desplegable de cuentas, cuando intenta iniciar una conversación "
-"nueva o unirse a una charla, puede que los detalles de su cuenta no sean "
-"correctos."
+#: C/audio-video.page:195(td/p)
+msgid "sametime"
+msgstr "sametime"
 
-#: C/prob-conn-acctdisabled.page:49(p)
-msgid ""
-"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
-"account that is not working."
-msgstr ""
-"Elija <guiseq><gui>Editar</gui><gui>Cuentas</gui></guiseq> y seleccione la "
-"cuenta que no está funcionando."
+#: C/audio-video.page:200(td/p)
+msgid "silc"
+msgstr "silc"
 
-#: C/prob-conn-acctdisabled.page:66(p)
-msgid "Check that the account is switched on."
-msgstr "Compruebe que la cuenta está activada"
+#: C/audio-video.page:205(td/p) C/create-account.page:89(section/title)
+msgid "SIP"
+msgstr "SIP"
 
-#: C/prev-conv.page:8(desc)
-msgid "Browse or search your previous conversations."
-msgstr "Examinar o buscar en sus conversaciones anteriores"
+#: C/audio-video.page:210(td/p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
 
-#: C/prev-conv.page:36(title)
-msgid "View previous conversations"
-msgstr "Ver conversaciones anteriores"
+#: C/audio-video.page:215(td/p)
+msgid "zephyr"
+msgstr "zephyr"
 
-#: C/prev-conv.page:38(p)
+#: C/change-status.page:9(info/desc)
+msgid "Change your status to advertise your availability to your contacts."
+msgstr "Cambie su estado para avisar de su disponibilidad a sus contactos."
+
+#: C/change-status.page:39(page/title)
+msgid "Change your status"
+msgstr "Cambiar su estado"
+
+#: C/change-status.page:41(page/p)
 msgid ""
-"<app>Empathy</app> automatically saves all your text conversations you have "
-"with your contacts. You can <link xref=\"#search\">search through all of "
-"your previous conversations</link> or <link xref=\"#browse\">browse previous "
-"conversations</link> by contact and date."
+"You can set your status to indicate your availability to your contacts. "
+"<app>Empathy</app> allows you to select from a list of defined statuses."
 msgstr ""
-"<app>Empathy</app> guarda automáticamente todas las conversaciones de texto "
-"que tiene con sus contactos. Puede <link xref=\"#search\">buscar a través de "
-"todas sus conversaciones anteriores</link> o <link xref=\"#browse\">buscar "
-"conversación anteriores</link> por contacto y fecha."
+"Puede establecer su estado para indicar su disponibilidad a sus contactos. "
+"<app>Empathy</app> le permite seleccionar una lista de estados predefinidos."
 
-#: C/prev-conv.page:46(p)
+#: C/change-status.page:46(item/p)
 msgid ""
-"You do not need to be connected to the Internet to view and search your "
-"previous conversations."
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
 msgstr ""
-"No necesita estar conectado a Internet para ver y buscar en sus "
-"conversaciones anteriores."
+"Pulse en la lista desplegable en la parte superior de la ventana de la "
+"<gui>Lista de contactos</gui>."
 
-#: C/prev-conv.page:53(title)
-msgid "Search previous conversations"
-msgstr "Buscar conversaciones anteriores"
+#: C/change-status.page:51(item/p)
+msgid "Select a status from the list."
+msgstr "Seleccione un estado de la lista."
 
-#: C/prev-conv.page:55(p)
+#: C/change-status.page:57(page/p)
 msgid ""
-"You can perform a full-text search through all of your previous "
-"conversations."
+"See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
+"what they mean. You can also <link xref=\"set-custom-status\">add custom "
+"status messages</link> to provide more information about your availability "
+"to your contacts."
 msgstr ""
-"Puede realizar una búsqueda de texto completo sobre todas sus conversaciones "
-"anteriores."
+"Consulte la <link xref=\"status-icons\"/> para obtener una lista de los "
+"estados predefinidos y lo que significan. También puede <link xref=\"set-"
+"custom-status\">añadir mensajes de estado personalizados</link> para "
+"proporcionar a sus contactos más información acerca de su disponibilidad."
 
-#: C/prev-conv.page:59(p) C/prev-conv.page:87(p)
+#: C/change-status.page:63(note/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
-"<key>F3</key>."
+"If you do not use your computer for a while, or if the screensaver is on, "
+"the status will be automatically set to Away."
 msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Ver</"
-"gui><gui>Conversaciones anteriores</gui></guiseq>. Alternativamente, pulse "
-"<key>F3</key>."
+"Si no usa su equipo durante un rato, o si se activa el salvapantallas, el "
+"estado se cambiará automáticamente a Ausente."
 
-#: C/prev-conv.page:63(p)
-#| msgid ""
-#| "Select an account from the drop-down list in the top left. A list of "
-#| "contacts and chat room for that account will be shown below."
-msgid ""
-"Select an account from the drop-down list in the top. A list of contacts and "
-"chat room for that account will be shown below."
-msgstr ""
-"Seleccione una cuenta de la lista desplegable en la parte superior. Para esa "
-"cuenta se mostrará debajo una lista de contactos y una sala de chat."
+#: C/create-account.page:9(info/desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "Registre una cuenta con uno de los servicios de mensajería soportados."
 
-#: C/prev-conv.page:67(p)
+#: C/create-account.page:34(page/title)
+msgid "Register for a new account"
+msgstr "Registrar una cuenta nueva"
+
+#: C/create-account.page:36(page/p)
 msgid ""
-"Type the text you want to search for in the <gui>Search</gui> text field."
+"Most account types require you to create an account with a account provider "
+"before you can connect using instant messaging applications like "
+"<app>Empathy</app>. With some account providers, you can use <app>Empathy</"
+"app> to register for a new account, using the same steps as you would to "
+"<link xref=\"add-account\">add an account</link>."
 msgstr ""
-"Escriba el texto que quiere buscar en el cuadro de texto <gui>Buscar</gui>"
+"Muchos tipos de cuenta requieren que cree una cuenta con un proveedor de "
+"cuentas antes de poder conectarse y usar aplicaciones de mensajería "
+"instantánea como <app>Empathy</app>. Con algunos proveedores de cuentas "
+"puede usar <app>Empathy</app> para registrar una cuenta nueva, usando los "
+"mismos pasos que seguiría en <link xref=\"add-account\">añadir una cuenta</"
+"link>."
 
-#: C/prev-conv.page:71(p)
-#| msgid ""
-#| "Any conversations that matched your search terms will be shown in the "
-#| "list below the search field. By default, conversations are ordered by "
-#| "date."
+#: C/create-account.page:42(page/p)
 msgid ""
-"Any conversations that matched your search terms will be shown. By default, "
-"conversations are ordered by date."
+"This page provides information on creating a new account for various types "
+"of accounts. Your account provider should give you a login ID and a "
+"password, as well as any additional information you need to connect using "
+"<app>Empathy</app>."
 msgstr ""
-"Se mostrará cualquier conversación que coincida con sus términos de "
-"búsqueda. Las conversaciones se ordenan por fecha de forma predeterminada."
+"Esta página proporciona información acerca de crear una cuenta nueva para "
+"varios tipos de cuenta. Su proveedor de cuentas debería proporcionarle un ID "
+"de inicio de sesión y una contraseña, así como otra información adicional "
+"que puede necesitar para conectarse con <app>Empathy</app>."
 
-#: C/prev-conv.page:80(title)
-msgid "Browse previous conversations"
-msgstr "Examinar conversaciones anteriores"
+#: C/create-account.page:47(section/title)
+msgid "Facebook"
+msgstr "Facebook"
 
-#: C/prev-conv.page:82(p)
+#: C/create-account.page:48(section/p)
 msgid ""
-"You can browse your previous conversations with your contacts or in chat "
-"rooms by date."
+"Facebook is one of the most-used social networks. It allows users to create "
+"their own profile and to communicate with their friends."
 msgstr ""
-"Puede examinar por fecha las conversaciones anteriores con sus contactos o "
-"en salas de chat."
+"Facebook es una de las redes sociales más usadas. Permite a los usuarios "
+"crear su propio perfil y comunicarse con sus amigos."
 
-#: C/prev-conv.page:91(p)
+#: C/create-account.page:52(section/p)
 msgid ""
-"Select an account from the drop-down list in the top left. A list of "
-"contacts and chat room for that account will be shown below."
+"To use Facebook to communicate with your friends, you will need to create a "
+"new account from the website: <link href=\"http://www.facebook.com\">www."
+"facebook.com</link>."
 msgstr ""
-"Seleccione una cuenta de la lista desplegable en la parte superior "
-"izquierda. Para esa cuenta se mostrará debajo una lista de contactos y una "
-"sala de chat."
+"Para usar Facebook para comunicarse con sus amigos necesita crear una cuenta "
+"nueva desde el sitio web: <link href=\"http://www.facebook.com\">www."
+"facebook.com</link>."
 
-#: C/prev-conv.page:95(p)
+#: C/create-account.page:62(section/p)
 msgid ""
-"Select a contact or chat room to view your previous conversations from. By "
-"default the most recent conversation will be shown."
+"Jabber is an open instant messaging system. Like email, Jabber allows you to "
+"choose your account provider and communicate with all other Jabber users, "
+"regardless of their account provider."
 msgstr ""
-"Para ver sus conversaciones anteriores, seleccione un contacto o una sala de "
-"chat. De forma predeterminada se muestra la conversación más reciente."
+"Jabber es un sistema de mensajería instantánea abierto. Como el correo-e, "
+"Jabber le permite elegir su proveedor de la cuenta y comunicarse con otros "
+"usuarios de Jabber, independientemente del proveedor de la cuenta."
 
-#: C/prev-conv.page:99(p)
+#: C/create-account.page:66(section/p)
 msgid ""
-"You can browse your conversations by date. Days on which you had a "
-"conversation with the selected contact will be shown in bold text. Click a "
-"date to select it. Click the arrows next to the month and year to browse "
-"earlier dates."
+"You will need to create a new account with a Jabber provider. There are many "
+"free providers; one popular provider is <link href=\"http://register.jabber."
+"org/\">Jabber.org</link>."
 msgstr ""
-"Puede examinar sus conversaciones por fecha. Los días en los que mantuvo una "
-"conversación con el contacto seleccionado se mostrarán en negrita. Pulse "
-"sobre una fecha para seleccionarla. Pulse las fechas junto al mes y año para "
-"examinar fechas anteriores."
+"Deberá crear una cuenta nueva con un proveedor Jabber. Existen muchos "
+"proveedores libres; un proveedor popular es <link href=\"http://register."
+"jabber.org/\">Jabber.org</link>."
 
-#: C/prev-conv.page:105(p)
-#| msgid ""
-#| "You can search for text in the displayed conversation by typing into the "
-#| "search field at the top. The matching text will be highlighted."
+#: C/create-account.page:71(note/p)
 msgid ""
-"You can search for text in the conversations by typing into the search field "
-"at the top. The matching conversations will be showed."
+"If you use Google Mail or Google Talk, you already have a Jabber account. "
+"Google Talk is a Jabber service. Simply use your Google Mail address and "
+"password in <app>Empathy</app> to connect."
 msgstr ""
-"Puede buscar texto en las conversaciones mostradas escribiéndolo en el campo "
-"de búsqueda en la parte superior. Se resaltarán las conversaciones "
-"coincidentes."
+"Si usa Google Mail o Google Talk ya tiene una cuenta Jabber. Talk es un "
+"servicio Jabber. Simplemente use en <app>Empathy</app> su dirección de "
+"Google Mail y su contraseña para conectarse."
 
-#: C/prev-conv.page:111(p)
-#| msgid ""
-#| "You can quickly view the previous conversations with one of your contacts "
-#| "from the <gui>Contact List</gui> window. Simply right click the contact "
-#| "and choose <gui>View Previous Conversations</gui>. The <gui>Previous "
-#| "Conversations</gui> window will open with that contact already selected."
+#: C/create-account.page:80(section/p)
 msgid ""
-"You can quickly view the previous conversations with one of your contacts "
-"from the <gui>Contact List</gui> window. Simply right click the contact and "
-"choose <gui>Previous Conversations</gui>. The <gui>Previous Conversations</"
-"gui> window will open with that contact already selected."
+"You do not need to create an account with a service provider to use this "
+"feature. This service works whenever you are connected to a local network, "
+"such as a wireless hotspot. It automatically finds all other users on the "
+"network who are also using this service."
 msgstr ""
-"Puede ver rápidamente las conversaciones anteriores con uno de sus contactos "
-"desde la ventana <gui>Lista de contactos</gui>. Simplemente pulse con el "
-"botón derecho del ratón sobre el contacto y seleccione <gui>Conversaciones "
-"anteriores</gui>. Se abrirá la ventana <gui>Conversaciones previas</gui> con "
-"el contacto seleccionado."
-
-#: C/link-contacts.page:11(desc)
-msgid "Merge and separate different contacts into a single one."
-msgstr "Unir y separar diferentes contactos en uno solo."
-
-#: C/link-contacts.page:25(title)
-msgid "Combine and separate contacts"
-msgstr "Combinar y separar contactos"
+"Para usar esta característica no necesita crear una cuenta con un proveedor "
+"de servicios. Este servicio funciona siempre que esté conectado a una red "
+"local, tal como un punto inalámbrico. Automáticamente encuentra otros "
+"usuarios en la red que estén usando este servicio."
 
-#: C/link-contacts.page:26(p)
-msgid ""
-"If one, or more, of your contacts has multiple accounts with different "
-"messaging services, you can combine these contacts into a single one."
+#: C/create-account.page:85(section/p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
 msgstr ""
-"Si uno o más de sus contactos tiene múltiples cuentas con diferentes "
-"servicios de mensajería, puede combinar esos contactos en uno solo."
+"Para obtener más información consulte la <link xref=\"salut-protocol\"/>."
 
-#: C/link-contacts.page:30(p)
+#: C/create-account.page:91(section/p)
 msgid ""
-"The resulting contact is called a <em>meta-contact</em>: a contact composed "
-"from different single contacts."
+"SIP is an open system which allows users to have audio and video "
+"conversations over the Internet. You need to create an account with a SIP "
+"provider. You can communicate with all other SIP users, regardless of which "
+"SIP provider they use."
 msgstr ""
-"Al contacto resultante se le llama <em>metacontacto</em>: un contacto "
-"compuesto de diferentes contactos simples."
+"SIP es un sistema abierto que permite a los usuarios realizar conversaciones "
+"de sonido y vídeo en Internet. Debe crear una cuenta con un proveedor SIP. "
+"Puede comunicarse con todos los usuarios SIP, independientemente del "
+"proveedor SIP que usen."
 
-#: C/link-contacts.page:34(p)
+#: C/create-account.page:97(note/p)
 msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
+"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
+"index.php?page=register\">Ekiga.net</link> service does not currently work "
+"with <app>Empathy</app>."
 msgstr ""
-"Si tiene un contacto Juan Pérez que usa tres servicios de mensajería de "
-"contactos como:"
-
-#: C/link-contacts.page:40(p)
-msgid "janes@facebook"
-msgstr "juan@facebook"
-
-#: C/link-contacts.page:45(p)
-msgid "jane.smith@gmail"
-msgstr "juan.perez@gmail"
-
-#: C/link-contacts.page:50(p)
-msgid "jane_smith@hotmail"
-msgstr "juan_perez@hotmail"
-
-#: C/link-contacts.page:55(p)
-msgid "You can combine these contacts into a single Jane Smith one."
-msgstr "Puede combinar estos contactos en un solo Juan Pérez."
-
-#: C/link-contacts.page:60(title)
-msgid "Combining contacts"
-msgstr "Combinar contactos"
+"Debido a algunas diferencias, actualmente el servicio libre <link href="
+"\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> no "
+"funciona con <app>Empathy</app>."
 
-#: C/link-contacts.page:63(p)
+#: C/create-account.page:102(section/p)
 msgid ""
-"From the <gui>Contact List</gui> window, right-click one of the contact that "
-"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
-"gui>."
+"Some SIP providers allow you to call normal phones from your computer. "
+"Generally, you will need to subscribe to a paid service for this feature."
 msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui> pulse con el botón derecho "
-"uno de los contactos que tiene diferentes cuentas y seleccione <gui style="
-"\"menuitem\">Enlazar contactos...</gui>."
+"Algunos proveedores SIP le permiten llamar a teléfonos normales desde su "
+"equipo. Generalmente deberá suscribirse a un servicio de pago para usar esta "
+"característica."
 
-#: C/link-contacts.page:70(p)
+#: C/create-account.page:109(section/p)
 msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
+"You do not need to register for an account to use IRC. Although you specify "
+"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
+"is only established each time you connect. If another user is using the "
+"nickname, you will need to choose a new nickname."
 msgstr ""
-"Desde el panel izquierdo, en la ventana <gui>Enlazar contatos</gui>, "
-"seleccione los contactos que quiere combinar."
-
-#: C/link-contacts.page:76(p)
-msgid "Click <gui style=\"button\">Link</gui>."
-msgstr "Pulse <gui style=\"button\">Enlazar</gui>."
+"No necesita registrar una cuenta para usar el IRC. Aunque especifique un "
+"apodo al añadir una cuenta IRC en <app>Empathy</app>, este apodo sólo se "
+"establece cada vez que se conecta. Si otro usuario está usando el nombre, "
+"deberá elegir un apodo nuevo."
 
-#: C/link-contacts.page:82(p)
+#: C/create-account.page:114(section/p)
 msgid ""
-"When a meta-contact has been created, the default contact that will be used "
-"to have a conversation with when you double-click on it, is the contact with "
-"the highest presence on-line."
+"Some IRC networks use a service called NickServ to allow users to protect "
+"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
 msgstr ""
-"Cuando se ha creado un metacontacto, el contacto predeterminado que se usará "
-"para tener una conversación al pulsar dos veces sobre él, es el último "
-"contacto con presencia en línea."
-
-#: C/link-contacts.page:91(title)
-msgid "Separating contacts"
-msgstr "Separar contactos"
+"Algunas redes IRC usan un servicio llamado NickServ para permitir a los "
+"usuarios proteger sus apodos. Para obtener más información consulte la <link "
+"xref=\"irc-nick-password\"/>."
 
-#: C/link-contacts.page:94(p)
+#: C/create-account.page:117(section/p)
 msgid ""
-"From the <gui>Contact List</gui>, right-click the contact to separate, and "
-"select <gui style=\"menuitem\">Link Contacts...</gui>."
+"Some IRC servers are password protected. You will need to know the password "
+"to connect to these servers. Generally, these are private IRC networks."
 msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui> pulse con el botón derecho "
-"del ratón para separar, y seleccione <gui style=\"menuitem\">Enlazar "
-"contactos...</gui>."
-
-#: C/link-contacts.page:100(p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "Pulse <gui style=\"button\">Desenlazar</gui>."
-
-#: C/license.page:8(desc)
-msgid "Legal information."
-msgstr "Información legal."
+"Algunos servidores de IRC están protegidos con contraseña. Necesitará "
+"conocer la contraseña para conectarse a esos servidores. Generalmente son "
+"redes de IRC privadas."
 
-#: C/license.page:11(title)
-msgid "License"
-msgstr "Licencia"
+#: C/create-account.page:122(section/title)
+msgid "Proprietary Services"
+msgstr "Servicios propietarios"
 
-#: C/license.page:12(p)
+#: C/create-account.page:124(section/p)
 msgid ""
-"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
-"Unported license."
+"There are many proprietary instant messaging services that have been "
+"developed by different companies or organizations. <app>Empathy</app> allows "
+"you to connect to an existing account for most popular services. To create a "
+"new account with one of these services, you will need to visit the service’s "
+"web site and agree to its terms of use."
 msgstr ""
-"Este trabajo está licenciado bajo una Licencia Creative Commons Atribución - "
-"Compartir igual 3.0 sin soporte."
-
-#: C/license.page:20(p)
-msgid "You are free:"
-msgstr "Es libre de:"
-
-#: C/license.page:25(em)
-msgid "To share"
-msgstr "Compartir"
-
-#: C/license.page:26(p)
-msgid "To copy, distribute and transmit the work."
-msgstr "Copiar, distribuir y comunicar públicamente la obra"
+"Existen muchos servicios propietarios de mensajería instantánea "
+"desarrollados por diferentes empresas u organizaciones. <app>Empathy</app> "
+"le permite conectarse a una cuenta existente de los servicios más populares. "
+"Para crear una cuenta nueva con uno de esos servicios deberá visitar el "
+"servicio web del sitio y aceptar los términos de uso."
 
-#: C/license.page:29(em)
-msgid "To remix"
-msgstr "Hacer obras derivadas"
+#: C/create-account.page:132(item/p)
+msgid "<link href=\"http://dashboard.aim.com/aim\">AIM</link>"
+msgstr "<link href=\"http://dashboard.aim.com/aim\">AIM</link>"
 
-#: C/license.page:30(p)
-msgid "To adapt the work."
-msgstr "Adaptar el trabajo."
+#: C/create-account.page:137(item/p)
+msgid "<link href=\"https://www.icq.com/register/\">ICQ</link>"
+msgstr "<link href=\"https://www.icq.com/register/\">ICQ</link>"
 
-#: C/license.page:33(p)
-msgid "Under the following conditions:"
-msgstr "Bajo las siguientes condiciones:"
+#: C/create-account.page:142(item/p)
+msgid "<link href=\"https://accountservices.passport.net\">MSN</link>"
+msgstr "<link href=\"https://accountservices.passport.net\">MSN</link>"
 
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "Atribución"
+#: C/create-account.page:147(item/p)
+msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
+msgstr "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
 
-#: C/license.page:39(p)
-msgid ""
-"You must attribute the work in the manner specified by the author or "
-"licensor (but not in any way that suggests that they endorse you or your use "
-"of the work)."
+#: C/disable-account.page:9(info/desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
 msgstr ""
-"Debe reconocer los créditos de la obra de la manera especificada por el "
-"autor o el licenciador (pero no de una manera que sugiera que tiene su apoyo "
-"o apoyan el uso que hace de su obra)."
+"Evitar que <app>Empathy</app> inicie sesión automáticamente en una cuenta."
 
-#: C/license.page:46(em)
-msgid "Share Alike"
-msgstr "Compartir igual"
+#: C/disable-account.page:40(page/title)
+msgid "Disable an account"
+msgstr "Desactivar una cuenta"
 
-#: C/license.page:47(p)
+#: C/disable-account.page:42(page/p)
 msgid ""
-"If you alter, transform, or build upon this work, you may distribute the "
-"resulting work only under the same, similar or a compatible license."
+"You can disable an account to prevent <app>Empathy</app> from logging in to "
+"it without removing the account entirely. You may wish to disable and re-"
+"enable an account if you only want to be logged in to the account at certain "
+"times, but you still want to use <app>Empathy</app> for other accounts."
 msgstr ""
-"Si transforma o modifica esta obra para crear una obra derivada, sólo puede "
-"distribuir la obra resultante bajo la misma licencia, una de similar o una "
-"de compatible."
+"Puede desactivar una cuenta para evitar que <app>Empathy</app> inicie sesión "
+"en ella, sin tener que quitar la cuenta completamente. Puede querer "
+"desactivar una cuenta y reactivarla si sólo quiere iniciar sesión en la "
+"cuenta de vez en cuando, pero sigue queriendo usar <app>Empathy</app> para "
+"otras cuentas."
 
-#: C/license.page:53(p)
+#: C/disable-account.page:53(item/p)
 msgid ""
-"For the full text of the license, see the <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
-"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">Commons Deed</link>."
+"Select the account you wish to disable from the accounts list on the left "
+"side of the window."
 msgstr ""
-"Para ver el texto completo de la licencia consulte la <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode/\">página web de Creative "
-"Commons</link> o lea el<link href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">Escrito de Commons</link>."
+"Seleccione la cuenta que quiere desactivar desde la lista de cuentas en la "
+"parte izquierda de la ventana."
 
-#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation with an IRC contact."
-msgstr "Iniciar una conversación con un contacto del IRC."
+#: C/disable-account.page:57(item/p)
+msgid "On the right side of the window, switch it off."
+msgstr "Desactívela en la parte derecha de la ventana,"
 
-#: C/irc-start-conversation.page:30(title)
-msgid "Chat with somebody on IRC"
-msgstr "Charlar con alguien en el IRC"
+#: C/disable-account.page:62(page/p)
+msgid "To re-enable the account, switch it on."
+msgstr "Para reactivar la cuenta, actívela."
 
-#: C/irc-start-conversation.page:32(p)
-msgid ""
-"You can hold private conversations with other IRC users, outside of the "
-"public IRC chat rooms. To start a conversation with another IRC user:"
-msgstr ""
-"Puede mantener conversaciones privadas con otros usuarios del IRC, fuera de "
-"las salas públicas del IRC. Para iniciar una conversación con otro usuario "
-"del IRC:"
+#: C/favorite-rooms.page:10(info/desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "Configurar, unirse a y gestionar salas favoritas."
 
-#: C/irc-start-conversation.page:37(p)
-msgid ""
-"In the contact list for an IRC chat room, double click the name of the user "
-"you want to chat with. Alternatively, right click the name of the user and "
-"choose <gui>Chat</gui>."
-msgstr ""
-"En la lista de contactos para la sala de chat del IRC, pulse dos veces en el "
-"nombre del usuario con el que quiere charlar. Alternativamente, pulse con el "
-"botón derecho del ratón sobre el nombre del usuario y elija <gui>Chat</gui>."
+#: C/favorite-rooms.page:29(page/title)
+msgid "Favorite rooms"
+msgstr "Salas favoritas"
 
-#: C/irc-start-conversation.page:45(p)
+#: C/favorite-rooms.page:32(section/title)
+msgid "Set a room as a favorite"
+msgstr "Establecer una sala como favorita"
+
+#: C/favorite-rooms.page:35(item/p)
+msgid "Join a room."
+msgstr "Unirse a una sala."
+
+#: C/favorite-rooms.page:40(item/p)
 msgid ""
-"The IRC room contact list is not the same as <app>Empathy</app> contact "
-"list. It contains a list of users in the IRC chat room you joined. Different "
-"rooms can have different contacts listed."
+"See <link xref=\"irc-join-room\"/> for more information on how to join an "
+"IRC room."
 msgstr ""
-"La lista de contactos de la sala IRC no es igual que la lista de contactos "
-"de <app>Empathy</app>. Contiene una lista de usuarios en la sala de chat del "
-"IRC a la que se ha unido. Salas diferentes pueden tener diferentes listados "
-"de contactos."
+"Para obtener más información acerca de cómo unirse a una sala de chat IRC, "
+"consulte la <link xref=\"irc-join-room\"/>."
 
-#: C/irc-start-conversation.page:52(p)
+#: C/favorite-rooms.page:46(item/p)
 msgid ""
-"The IRC room contact list is usually on the right side of the IRC room "
-"window. If you do not see it, choose <guiseq><gui>Conversation</"
-"gui><gui>Show Contact List</gui></guiseq>."
+"See <link xref=\"group-conversations\"/> for more information on how to "
+"start or join a group conversation."
 msgstr ""
-"La lista de contactos de una sala IRC generalmente está en la parte derecha "
-"de la ventana de la sala del IRC. Si no la ve elija "
-"<guiseq><gui>Conversación</gui><gui>Mostrar lista de contactos</gui></"
-"guiseq>."
+"Para obtener más información acerca de cómo unirse a una conversación en "
+"grupo, consulte la <link xref=\"group-conversations\"/>."
 
-#: C/irc-send-file.page:9(desc)
-msgid "<app>Empathy</app> does not currently support sending files using IRC."
+#: C/favorite-rooms.page:54(item/p)
+msgid ""
+"From the conversation window, choose <guiseq><gui>Conversation</"
+"gui><gui>Favorite Chat Room</gui></guiseq>."
 msgstr ""
-"Actualmente <app>Empathy</app> no soporta enviar archivos a través del IRC."
-
-#: C/irc-send-file.page:31(title)
-msgid "Send files over IRC"
-msgstr "Enviar archivos a través del IRC"
+"Desde la ventana de conversación, elija <guiseq><gui>Conversación</"
+"gui><gui>Sala de chat favorita</gui></guiseq>."
 
-#: C/irc-send-file.page:33(p)
-msgid "It is not currently possible to send files using IRC."
-msgstr "Actualmente no es posible enviar archivos a través del IRC."
+#: C/favorite-rooms.page:63(section/title)
+msgid "Join favorite rooms"
+msgstr "Unirse a las salas favoritas"
 
-#: C/irc-nick-password.page:10(desc)
-msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr "Proteja su apodo para prevenir que otros usuarios del IRC lo usen."
+#: C/favorite-rooms.page:66(item/p) C/send-file.page:40(item/p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+msgstr ""
+"En la ventana de la <gui>Lista de contactos</gui> realice una de las "
+"siguientes acciones:"
 
-#: C/irc-nick-password.page:33(title)
-msgid "Use a nickname password on IRC"
-msgstr "Usar una contraseña para un apodo en el IRC"
+#: C/favorite-rooms.page:71(item/p)
+msgid "Press <key>F5</key>."
+msgstr "Pulse <key>F5</key>."
 
-#: C/irc-nick-password.page:35(p)
+#: C/favorite-rooms.page:76(item/p)
 msgid ""
-"On some IRC networks, you can register your nickname with a service called "
-"NickServ. By sending special messages to NickServ, you can set your password "
-"and identify yourself. Some IRC chat rooms may not allow you to join without "
-"a registered nickname."
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
+"all your favorite rooms."
 msgstr ""
-"En algunas redes de IRC puede registrar su apodo con un servicio llamado "
-"NickServ. Enviando mensajes especiales a NickServ puede configurar su "
-"contraseña e identificarse. Puede que algunas salas de chat IRC no le "
-"permitan unirse sin un nombre registrado."
+"Elija <guiseq><gui>Salas</gui><gui>Unirse a las favoritas</gui></guiseq> "
+"para unirse a todas sus salas favoritas."
 
-#: C/irc-nick-password.page:40(p)
-msgid ""
-"<app>Empathy</app> does not currently support nickname registration. Some "
-"IRC networks, however, will automatically forward a <em>server password</em> "
-"to NickServ. On these networks, you can use the IRC password in "
-"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
-"network is known to have this feature."
+#: C/favorite-rooms.page:82(item/p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
 msgstr ""
-"Actualmente <app>Empathy</app> no soporta el registro de apodos. No obstante "
-"algunos servidores de IRC reenviarán automáticamente una <em>contraseña de "
-"servidor</em> a NickServ. En esas redes podrá usar contraseñas de IRC en "
-"<app>Empathy</app> para identificarse contra NickServ. Se sabe que la "
-"popular red freenode dispone de esta característica."
-
-#: C/irc-nick-password.page:46(p)
-msgid "To set an IRC server password:"
-msgstr "Para establecer una contraseña de servidor de IRC:"
+"Elija <gui>Sala</gui> y seleccione la sala favorita a la que quiere unirse."
 
-#: C/irc-nick-password.page:54(p)
-msgid "Select the IRC account from the list on the left of the dialog."
+#: C/favorite-rooms.page:90(note/p)
+msgid ""
+"To join a favorite room, you need to be connected to the Internet and to "
+"your account."
 msgstr ""
-"Seleccione la cuenta de IRC de la lista en la parte izquierda del diálogo."
+"Para unirse a una sala favorita debe estar conectado a Internet y con la "
+"cuenta."
+
+#: C/favorite-rooms.page:98(section/title)
+msgid "Manage favorite rooms"
+msgstr "Gestionar las salas favoritas"
 
-#: C/irc-nick-password.page:57(p)
+#: C/favorite-rooms.page:101(item/p)
 msgid ""
-"In the <gui>Password</gui> field, type the password you used to register "
-"your nikcname."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Manage Favorites</gui></guiseq>."
 msgstr ""
-"En la caja de texto <gui>Contraseña</gui> escriba la contraseña que quiere "
-"usar para registrar su apodo."
-
-#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
-#: C/add-account.page:74(p)
-msgid "Click <gui style=\"button\">Apply</gui>."
-msgstr "Pulse <gui style=\"button\">Aplicar</gui>."
+"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Sala</"
+"gui><gui>Gestionar salas favoritas</gui></guiseq>."
 
-#: C/irc-nick-password.page:69(p)
+#: C/favorite-rooms.page:107(item/p)
 msgid ""
-"These instructions only allow you to use a password-protected nickname on "
-"certain IRC networks. It is not currently possible to register an IRC "
-"nickname or change your nickname password using <app>Empathy</app>."
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"manage the favorite rooms of."
 msgstr ""
-"Estas instrucciones sólo le permiten usar un apodo protegido por contraseña "
-"en ciertas redes de IRC. Actualmente no es posible registrar un apodo IRC o "
-"cambiar la contraseña de su apodo con <app>Empathy</app>."
+"Desde la lista desplegable <gui>Cuenta</gui> seleccione la cuenta de la que "
+"quiere gestionar las salas favoritas."
 
-#: C/irc-manage.page:10(desc)
-msgid "How to use IRC with <app>Empathy</app>."
-msgstr "Cómo usar el IRC con <app>Empathy</app>."
+#: C/favorite-rooms.page:111(item/p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr "Pulse <gui>Todas</gui> para entrar en todas sus salas favoritas."
 
-#: C/irc-manage.page:35(title)
-msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relay Chat (IRC)"
+#: C/favorite-rooms.page:116(item/p)
+msgid "Select the favorite room you want to manage:"
+msgstr "Seleccione la sala favorita que quiere gestionar:"
 
-#: C/irc-manage.page:38(p) C/account-irc.page:39(p)
+#: C/favorite-rooms.page:121(item/p)
 msgid ""
-"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
-"<app>Empathy</app>."
+"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
+"that room when you connect to your account."
 msgstr ""
-"Debe tener instalado el paquete <sys>telepathy-idle</sys> para poder usar el "
-"IRC en <app>Empathy</app>."
+"Seleccione la casilla de verificación <gui>Autoconectar</gui> para unirse a "
+"esa sala automáticamente al conectarse con la cuenta."
 
-#: C/irc-manage.page:42(link)
-msgid "Install telepathy-idle"
-msgstr "Instale telepathy-idle"
+#: C/favorite-rooms.page:127(item/p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+msgstr "Pulse <gui>Quitar</gui> para quitar la sala de sus favoritas."
 
-#: C/irc-manage.page:49(title)
-msgid "IRC Chat Rooms and Conversations"
-msgstr "Salas de chat y conversaciones en el IRC"
+#: C/favorite-rooms.page:134(item/p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "Cuando haya terminado pulse <gui>Cerrar</gui>."
 
-#: C/irc-manage.page:51(title)
-msgid "Chat Rooms and Conversations"
-msgstr "Salas de chat y conversaciones"
+#: C/geolocation.page:8(info/desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "Usar y entender la geolocalización en <app>Empathy</app>."
 
-#: C/irc-manage.page:56(title)
-msgid "Common IRC Problems"
-msgstr "Problemas comunes en el IRC"
+#: C/geolocation.page:32(page/title)
+msgid "Geographical position"
+msgstr "Posición geográfica"
 
-#: C/irc-manage.page:58(title) C/index.page:55(title)
-msgid "Common Problems"
-msgstr "Problemas comunes"
+#: C/geolocation.page:35(section/title)
+msgid "Geolocation"
+msgstr "Geolocalización"
 
-#: C/irc-join-room.page:8(desc)
-msgid "Join an IRC channel."
-msgstr "Entrar en un canal IRC."
+#: C/geolocation.page:39(section/title)
+msgid "Fix common problems"
+msgstr "Solucionar problemas comunes"
 
-#: C/irc-join-room.page:31(title)
-msgid "Join an IRC chat room"
-msgstr "Unirse a una sala en el IRC"
+#: C/geolocation-not-showing.page:8(info/desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "<app>Empathy</app> no publica mi posición geográfica."
 
-#: C/irc-join-room.page:33(p)
-msgid ""
-"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
-"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
-"account\"/> and <link xref=\"account-irc\"/>."
-msgstr ""
-"Puede unirse a salas de chat IRC (también conocidos como canales de IRC) en "
-"cualquier red de IRC a la que esté conectado. Para conectarse a una red de "
-"IRC consulte la <link xref=\"add-account\"/> y la <link xref=\"account-irc\"/"
-">."
+#: C/geolocation-not-showing.page:32(page/title)
+msgid "Geographical position not published"
+msgstr "Posición geográfica no publicada"
 
-#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
-#: C/group-conversations.page:122(p)
+#: C/geolocation-not-showing.page:34(page/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Join</gui></guiseq>."
+"If your contacts cannot see your location, <app>Empathy</app> might not be "
+"able to discover with a good margin of precision your geographical position."
 msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Sala</"
-"gui><gui>Unirse</gui></guiseq>."
+"Si sus contactos no ven su posición, <app>Empathy</app> puede no ser capaz "
+"de descubrir su posición geográfica con un buen margen de precisión."
 
-#: C/irc-join-room.page:45(p)
+#: C/geolocation-not-showing.page:38(page/p)
 msgid ""
-"From the <gui>Account</gui> drop-down list, select the IRC account that "
-"corresponds to the network you want to use."
+"In this case, your position will not be published, but you are still able to "
+"see the location of your contacts."
 msgstr ""
-"Desde la lista desplegable <gui>Cuenta</gui> elija la cuenta IRC que "
-"corresponda con la red que quiere usar."
+"En este caso no se publicará su posición pero aún podrá ver la posición de "
+"sus contactos."
 
-#: C/irc-join-room.page:51(p)
+#: C/geolocation-not-showing.page:42(page/p)
 msgid ""
-"In the <gui>Room</gui> text box, type the name of the channel you want to "
-"join. IRC channel names start with the hash character (<sys>#</sys>)."
+"If you want to publish your geographical position, you can try to use an "
+"external device such as a GPS."
 msgstr ""
-"En la caja de texto <gui>Sala</gui>, escriba el nombre del canal de IRC al "
-"que quiere unirse. Preceda el nombre con el carácter almohadilla (<sys>#</"
-"sys>)."
-
-#: C/irc-join-room.page:57(p)
-msgid "Click <gui>Join</gui> to enter the room."
-msgstr "Pulse <gui>Unirse</gui> para entrar en la sala."
+"Si quiere publicar su posición geográfica puede intentar usar un dispositivo "
+"externo tal como un GPS."
 
-#: C/irc-join-room.page:64(p)
+#: C/geolocation-not-showing.page:48(note/p)
 msgid ""
-"To join multiple rooms, you need to repeat the steps above for each room."
+"In order to publish your geographical location, your Jabber server needs to "
+"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
+"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
+"PEP</link> is maintained online. Google Talk does not support this feature "
+"at this time."
 msgstr ""
-"Para entrar en varias salas, debe repetir los pasos anteriores para cada "
-"sala."
-
-#: C/irc-join-pwd.page:9(desc)
-msgid "Enter password-protected IRC chat rooms."
-msgstr "Introduzca la contraseña para salas de chat IRC protegidas."
+"Para publicar su ubicación geográfica su servidor Jabber debe soportar el "
+"protocolo de eventos personales (PEP). Una lista de los <link href=\"http://"
+"coccinella.im/servers/servers_by_pubsub_pep.html\">servidores que soportan "
+"PEP</link> se mantiene en línea. Por el momento Google Talk no soporta esta "
+"característica."
 
-#: C/irc-join-pwd.page:25(title)
-msgid "Join a protected IRC chat room"
-msgstr "Unirse a una sala de chat protegida en el IRC"
+#: C/geolocation-privacy.page:8(info/desc)
+msgid "What information are sent and to who."
+msgstr "Qué información se envía y a quién."
 
-#: C/irc-join-pwd.page:27(p)
-msgid ""
-"On some IRC networks, private IRC rooms may be protected with a password. If "
-"you know the password, use the following steps to join:"
-msgstr ""
-"En algunas redes IRC las salas privadas de IRC pueden estar protegidas por "
-"contraseña. Si sabe la contraseña, realice los siguientes pasos para unirse:"
+#: C/geolocation-privacy.page:32(page/title)
+msgid "Geolocation Privacy"
+msgstr "Privacidad en la geolocalización"
 
-#: C/irc-join-pwd.page:33(p)
-msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
-msgstr "<link xref=\"irc-join-room\">Unirse a la sala</link> de forma normal."
+#: C/geolocation-privacy.page:35(section/title)
+msgid "What information is sent"
+msgstr "Qué información se envía"
 
-#: C/irc-join-pwd.page:38(p)
+#: C/geolocation-privacy.page:36(section/p)
 msgid ""
-"Empathy will prompt you for a password. Enter the password for the IRC chat "
-"room and click <gui style=\"button\">Join</gui>."
+"What is possible to send is: your country, region, locality, area, street, "
+"building, floor, room, and postal code, longitude, latitude and altitude, "
+"speed and bearing."
 msgstr ""
-"Empathy le preguntará la contraseña. Introduzca la contrseña para la sala de "
-"chat IRC y pulse <gui style=\"button\">Unirse</gui>."
-
-#: C/irc-commands.page:7(desc)
-msgid "The supported IRC commands."
-msgstr "Los comandos de IRC soportados."
-
-#: C/irc-commands.page:18(title)
-msgid "Supported IRC commands"
-msgstr "Comandos IRC soportados"
+"Es posible enviar: su país, región, localidad, área, calle, edificio, "
+"planta, habitación, código postal, longitud y altitud, velocidad y "
+"orientación."
 
-#: C/irc-commands.page:19(p)
+#: C/geolocation-privacy.page:40(section/p)
 msgid ""
-"To see the list of the supported IRC commands, in a chat room type <input>/"
-"help</input> and press <key>Enter</key>."
+"The accuracy and the quantity of information about your geographical "
+"position are based on the software or on the infrastructure used to discover "
+"your position."
 msgstr ""
-"Para ver una lista de los comandos de IRC soportados, en una sala de chat "
-"escriba <input>/help</input> y pulse <key>Intro</key> "
+"La precisión y cantidad de información acerca de su posición geográfica se "
+"basa en el software o en la infraestructura usada para descubrir su posición."
 
-#: C/irc-commands.page:24(p)
-msgid "All commands available have a small description on their usage."
+#: C/geolocation-privacy.page:44(section/p)
+msgid ""
+"Different kind of networks may have different accuracy settings, and may "
+"send different information. The use of external devices such as GPS or "
+"mobile phone will increase the accuracy of the information sent."
 msgstr ""
-"Todos los comandos disponibles tienen una pequeña descripción acerca de su "
-"uso."
+"Diferentes tipos de redes pueden tener diferentes ajustes de precisión y "
+"pueden enviar diferente información. El uso de dispositivos externos tales "
+"como un GPS o teléfono móvil puede aumentar la precisión de la información "
+"enviada."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/introduction.page:41(None)
+#: C/geolocation-privacy.page:49(section/p)
 msgid ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=54908dcb2588beddb15ef0968d2c2582"
+"When the privacy mode is enabled, nothing more precise than your city will "
+"be sent, even if you are using an external device."
 msgstr ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=54908dcb2588beddb15ef0968d2c2582"
+"Cuando el modo de privacidad está activado, no se enviará nada más preciso "
+"que la ciudad, incluso si está usando un dispositivo externo."
 
-#: C/introduction.page:9(desc)
-msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr "Introducción al programa de mensajería instantánea <app>Empathy</app>."
+#: C/geolocation-privacy.page:56(section/title)
+msgid "Who can see the information sent"
+msgstr "Quién puede ver la información enviada"
 
-#: C/introduction.page:21(title)
-msgid "Introduction"
-msgstr "Introducción"
+#: C/geolocation-privacy.page:57(section/p)
+msgid "Only your contacts can see your geographical position."
+msgstr "Sólo sus contactos pueden ver su posición geográfica."
+
+#: C/geolocation-privacy.page:63(section/title)
+msgid "What is the privacy mode"
+msgstr "Cuál es el modo de privacidad"
 
-#: C/introduction.page:23(p)
+#: C/geolocation-privacy.page:64(section/p)
 msgid ""
-"<app>Empathy</app> is an instant messaging application for the GNOME "
-"Desktop. It supports text messaging, voice &amp; video calls, file "
-"transfers, and all the most used messaging systems such as MSN and Google "
-"Talk."
+"The privacy mode, enabled by default, is a reduced accuracy mode that will "
+"decrease the accuracy of the geographical position sent to your contacts."
 msgstr ""
-"<app>Empathy</app> es una aplicación de mensajería instantánea para el "
-"Escritorio GNOME. soporte mensajes de texto, llamadas de voz y "
-"vídeollamadas, transferencias de archivos y los sistemas de mensajería más "
-"populares como MSN y Google Talk."
+"El modo de privacidad, activado de forma predeterminada, es un modo de "
+"precisión reducida de la información de posición geográfica enviada a sus "
+"contactos."
+
+#: C/geolocation-privacy.page:71(section/title)
+msgid "Privacy overview"
+msgstr "Visión general de la privacidad"
 
-#: C/introduction.page:28(p)
+#: C/geolocation-privacy.page:72(section/p)
 msgid ""
-"<app>Empathy</app> includes features that help you better collaborate while "
-"at work, and that let you easily keep in touch with your friends."
+"Overview of the various geolocation privacy settings in <app>Empathy</app>."
 msgstr ""
-"<app>Empathy</app> incluye características que le ayudarán a colaborar mejor "
-"en el trabajo y le permitirán mantener en contacto con sus amigos fácilmente."
+"Visión general de los ajustes de privacidad en la geolocalización de "
+"<app>Empathy</app>."
+
+#: C/geolocation-privacy.page:77(item/p)
+msgid "Geolocation is not enabled by default."
+msgstr "De forma predeterminada la geolocalización no está activada."
+
+#: C/geolocation-privacy.page:82(item/p)
+msgid "Privacy mode is enabled by default."
+msgstr "De forma predeterminada está activado el modo de privacidad."
 
-#: C/introduction.page:32(p)
+#: C/geolocation-privacy.page:87(item/p)
 msgid ""
-"Using <app>Empathy</app>, you can group all the conversations in a single "
-"window, have multiple windows for different kind of conversations, easily "
-"search through your previous conversations, and share your desktop in just "
-"two clicks."
+"Privacy mode prevails even when using external and more precise devices."
 msgstr ""
-"Usando <app>Empathy</app> puede agrupar las conversaciones en una sola "
-"ventana o tener múltiples ventanas para los diferentes tipos de "
-"conversaciones; búsqueda fácil de sus conversaciones anteriores y "
-"compartición de su escritorio con sólo un par de pulsaciones de ratón."
+"El modo de privacidad prevalece incluso cuando se está usando dispositivos "
+"externos más precisos."
 
-#: C/introduction.page:39(title)
-msgid "<gui>Contact List</gui> window"
-msgstr "Ventana de <gui>Lista de contactos</gui>"
+#: C/geolocation-privacy.page:92(item/p)
+msgid "Only your contacts can see your position."
+msgstr "Sólo sus contactos pueden ver su posición."
 
-#: C/introduction.page:40(desc)
-msgid "<app>Empathy</app> main window"
-msgstr "Ventana principal de <app>Empathy</app>"
+#: C/geolocation-supported.page:7(info/desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr "Servicios que soportan geolocalización y compatibilidad."
 
-#: C/introduction.page:42(p)
-msgid "<app>Empathy</app> main window."
-msgstr "Ventana principal de <app>Empathy</app>."
+#: C/geolocation-supported.page:31(page/title)
+msgid "Supported services"
+msgstr "Servicios soportados"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/index.page:28(None)
+#: C/geolocation-supported.page:33(page/p)
 msgid ""
-"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+"The geolocation feature at the moment is compatible only with the Jabber "
+"service. In order to use it, you and your contacts need to have a Jabber "
+"account."
 msgstr ""
-"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
-
-#: C/index.page:7(title) C/index.page:8(title)
-msgid "Empathy Internet Messenger"
-msgstr "Mensajería para Internet Empathy"
+"Por el momento la característica de geolocalización sólo es compatible con "
+"el servicio Jabber. Para usarla usted y sus contactos deben tener una cuenta "
+"Jabber."
 
-#: C/index.page:27(title)
+#: C/geolocation-supported.page:39(note/p)
 msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
-"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+"It is necessary that also the server you are using supports the geolocation "
+"feature. Most of the Jabber servers support it. See your service website "
+"documentation for more information."
 msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Logotipo de la mensajería para Internet Empathy</media> Mensajería para "
-"Internet Empathy"
-
-#: C/index.page:35(title)
-msgid "Account Management"
-msgstr "Gestión de cuentas"
-
-#: C/index.page:39(title)
-msgid "Contact Management"
-msgstr "Gestión de contactos"
-
-#: C/index.page:43(title)
-msgid "Text Conversations"
-msgstr "Conversaciones de texto"
+"Es necesario que también el servidor que está usando soporte la "
+"característica de geolocalización. La mayoría de los servidores Jabber la "
+"soporta. Para obtener más información consulte la documentación en la página "
+"web de su servicio."
 
-#: C/index.page:47(title)
-msgid "Audio and Video Conversations"
-msgstr "Conversaciones de sonido y vídeo"
+#: C/geolocation-supported.page:47(section/title)
+msgid "Compatibility"
+msgstr "Compatibilidad"
 
-#: C/index.page:51(title)
-msgid "Advanced Actions"
-msgstr "Acciones avanzadas"
+#: C/geolocation-supported.page:49(section/p)
+msgid ""
+"<app>Empathy</app> geolocation feature is not compatible with other "
+"geographical position services such as <em>Google Latitude</em>, <em>Yahoo "
+"Fire Eagle</em> or <em>Brightkite</em>."
+msgstr ""
+"La característica de geolocalización de <app>Empathy</app> no es compatible "
+"con otros servicios de posición geográfica tales como <em>Google Latitude</"
+"em>, <em>Yahoo Fire Eagle</em> o <em>Brightkite</em>."
 
-#: C/import-account.page:10(desc)
-msgid "Import an account from another instant messaging application."
-msgstr "Importar una cuenta de otra aplicación de mensajería instantánea."
+#: C/geolocation-turn.page:9(info/desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr "Cómo activar y desactivar la geolocalización en <app>Empathy</app>."
 
-#: C/import-account.page:19(name)
-msgid "Peter Haslam"
-msgstr "Peter Haslam"
+#: C/geolocation-turn.page:33(page/title)
+msgid "Activate/Deactivate geolocation"
+msgstr "Activar y desactivar la geolocalización"
 
-#: C/import-account.page:20(email)
-msgid "peter.haslam@freenet.de"
-msgstr "peter.haslam@freenet.de"
+#: C/geolocation-turn.page:37(item/p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+msgstr "Elija <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>."
 
-#: C/import-account.page:42(title)
-msgid "Import an existing account"
-msgstr "Importar una cuenta existente"
+#: C/geolocation-turn.page:42(item/p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "Seleccione la pestaña <gui>Ubicación geográfica</gui>."
 
-#: C/import-account.page:44(p)
+#: C/geolocation-turn.page:47(item/p)
 msgid ""
-"The first time you run <app>Empathy</app>, it will offer to import your "
-"accounts from other instant messaging applications. Currently, the only "
-"supported application is <app>Pidgin</app>."
+"Select <gui>Publish location to my contacts</gui> to activate geolocation."
 msgstr ""
-"La primera vez que ejecuta <app>Empathy</app> se le ofrecerá importar sus "
-"cuentas de otras aplicaciones de mensajería instantánea. Actualmente la "
-"única aplicación soportada es <app>Pidgin</app>."
+"Seleccione <gui>Publicar mi ubicación a mis contactos</gui> para activar la "
+"geolocalización."
 
-#: C/import-account.page:50(p)
+#: C/geolocation-turn.page:50(item/p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "Para desactivar la geolocalización, deselecciónela."
+
+#: C/geolocation-turn.page:55(item/p)
 msgid ""
-"Run <app>Empathy</app> for the first time. An assistant will offer you a "
-"number of options to create new accounts."
+"To increase the accuracy of your position, deselect <gui>Reduce location "
+"accuracy</gui>."
 msgstr ""
-"Ejecute <app>Empathy</app> por primera vez. un asistente le ofrecerá un "
-"número de opciones para crear cuentas nuevas."
+"Para aumentar la precisión de su posición, deseleccione <gui>Reducir la "
+"precisión de la ubicación</gui>."
 
-#: C/import-account.page:54(p)
+#: C/geolocation-turn.page:61(item/p)
 msgid ""
-"Select <gui>Yes, import my account details from</gui> and click "
-"<gui>Forward</gui>."
+"If you have an external device like a GPS or want to send a more accurate "
+"position, select the appropriate option in the <gui>Location sources</gui> "
+"section."
 msgstr ""
-"Seleccione <gui>Sí, importar los detalles de mi cuenta desde</gui> y pulse "
-"<gui>Siguiente</gui>."
+"Si tiene un dispositivo externo como un GPS y quiere enviar una posición más "
+"precisa, seleccione la opción apropiada en la sección <gui>Orígenes de las "
+"ubicaciones</gui>."
 
-#: C/import-account.page:58(p)
-msgid "Select the check box next to each account you wish to import."
-msgstr ""
-"Seleccione la casilla de verificación junto a cada cuenta que quiera "
-"importar."
+#: C/geolocation-what-is.page:9(info/desc)
+msgid "Understanding geolocation."
+msgstr "Entender la geolocalización"
 
-#: C/import-account.page:66(p)
+#: C/geolocation-what-is.page:33(page/title)
+msgid "What is geolocation"
+msgstr "¿Qué es la geolocalización?"
+
+#: C/geolocation-what-is.page:35(page/p)
 msgid ""
-"It is not currently possible to import accounts after you have completed the "
-"first-run assistant."
+"Geolocation allows you to identify the real geographical location of a "
+"computer or a device connected to the Internet."
 msgstr ""
-"Actualmente no es posible importar cuentas después de haber completado el "
-"asistente de primera ejecución."
+"La geolocalización le permite identificar la ubicación geográfica real de un "
+"equipo o un dispositivo conectado a internet."
 
-#: C/hide-contacts.page:8(desc)
-msgid "Hide the offline contacts from your <gui>Contact List</gui>."
-msgstr ""
-"Ocultar los contactos desconectados de su <gui>Lista de contactos</gui>."
+#: C/geolocation-what-is.page:37(page/p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "Con la geolocalización de <app>Empathy</app> puede:"
 
-#: C/hide-contacts.page:19(title)
-msgid "Hide offline contacts"
-msgstr "Ocultar contactos desconectados"
+#: C/geolocation-what-is.page:42(item/p)
+msgid "Publish your geographical location to your contacts."
+msgstr "Publicar su información geográfica a sus contactos."
 
-#: C/hide-contacts.page:21(p)
-msgid ""
-"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
-"with which you can have a conversation, and also those that are offline."
+#: C/geolocation-what-is.page:47(item/p)
+msgid "See your contacts’ geographical location and quickly contact them."
 msgstr ""
-"Generalmente <app>Empathy</app> muestra todos contactos: los que están "
-"conectados, con los que puede establecer una conversación, y también los que "
-"están desconectados."
-
-#: C/hide-contacts.page:25(p)
-msgid "To hide the contacts that are offline:"
-msgstr "Para ocultar los contactos desconectados:"
+"Vea la ubicación geográfica de sus contactos y contacte con ellos "
+"rápidamente."
 
-#: C/hide-contacts.page:31(p)
+#: C/geolocation-what-is.page:52(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</"
-"key><key>H</key></keyseq>."
+"Set the accuracy of your location and the device used to discover your "
+"location."
 msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Ver</"
-"gui><gui>Contactos desconectados</gui></guiseq> o pulse <keyseq><key>Ctrl</"
-"key><key>H</key></keyseq>."
+"Establezca la precisión de su ubicación y el dispositivo que usar para "
+"descubrir su ubicación."
 
-#: C/hide-contacts.page:36(p)
-msgid "To show the offline contacts again, repeat the same procedure above."
+#: C/geolocation-what-is.page:60(note/p)
+msgid ""
+"In order to see your contacts’ geographical locations, they need to use a "
+"service and an application that supports geolocation."
 msgstr ""
-"Para mostrar los contactos desconectados de nuevo, repita el mismo "
-"procedimiento anterior."
+"Para poder ver las ubicaciones geográficas de sus contactos, éstos deben "
+"usar un servicio y una aplicación que soporte geolocalización."
 
-#: C/group-conversations.page:8(desc)
+#: C/group-conversations.page:8(info/desc)
 msgid "Start or join a group conversation with your contacts."
 msgstr "Iniciar o unirse a un grupo de conversación con sus contactos."
 
-#: C/group-conversations.page:34(title)
+#: C/group-conversations.page:34(page/title)
 msgid "Group conversations"
 msgstr "Conversaciones en grupo"
 
-#: C/group-conversations.page:36(p)
+#: C/group-conversations.page:36(page/p)
 msgid ""
 "Group conversations permits you to have text conversations with more than "
 "one contact at the same time."
@@ -1848,7 +1808,7 @@ msgstr ""
 "Las conversaciones en grupo le permite mantener conversaciones de texto con "
 "más de un contacto al mismo tiempo."
 
-#: C/group-conversations.page:40(p)
+#: C/group-conversations.page:40(page/p)
 msgid ""
 "To have a group conversation you need to have a registered account with "
 "either Jabber or Google Talk, or a People Nearby account."
@@ -1856,7 +1816,7 @@ msgstr ""
 "Para tener una conversación en grupo debe haber registrado una cuenta en "
 "Jabber o Google Talk, o en Gente cerca."
 
-#: C/group-conversations.page:46(p)
+#: C/group-conversations.page:46(note/p)
 msgid ""
 "You can have a group conversation only with the contacts that are using the "
 "same service as yours."
@@ -1864,11 +1824,20 @@ msgstr ""
 "Puede tener conversaciones en grupo sólo con los contactos que usan el mismo "
 "servicio que el suyo."
 
-#: C/group-conversations.page:54(title)
+#: C/group-conversations.page:54(section/title)
 msgid "Start a group conversation"
 msgstr "Iniciar una conversación en grupo"
 
-#: C/group-conversations.page:63(p)
+#: C/group-conversations.page:58(item/p)
+#: C/group-conversations.page:122(item/p) C/irc-join-room.page:39(item/p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Join</gui></guiseq>."
+msgstr ""
+"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Sala</"
+"gui><gui>Unirse</gui></guiseq>."
+
+#: C/group-conversations.page:63(item/p)
 msgid ""
 "From the <gui>Account</gui> drop-down list, select the account you want to "
 "use for the group conversation."
@@ -1876,7 +1845,7 @@ msgstr ""
 "Desde la lista desplegable <gui>Cuenta</gui> seleccione la cuenta que quiera "
 "usar para la conversación en grupo."
 
-#: C/group-conversations.page:69(p)
+#: C/group-conversations.page:69(item/p)
 msgid ""
 "In the <gui>Server</gui> text box, type the name of server in which the "
 "conversation will be hosted."
@@ -1884,11 +1853,11 @@ msgstr ""
 "En la caja de texto <gui>Servidor</gui> escriba el nombre del servidor en el "
 "que se hospedará la conversación."
 
-#: C/group-conversations.page:73(p)
+#: C/group-conversations.page:73(item/p)
 msgid "Leave it empty if it will be on the current server."
 msgstr "Déjelo vacío si será en el servidor actual."
 
-#: C/group-conversations.page:78(p)
+#: C/group-conversations.page:78(item/p)
 msgid ""
 "In the <gui>Room</gui> text box, type the name you want to give to the "
 "conversation."
@@ -1896,7 +1865,7 @@ msgstr ""
 "En la caja de texto <gui>Sala</gui> escriba el nombre que quiere darle a la "
 "conversación."
 
-#: C/group-conversations.page:82(p)
+#: C/group-conversations.page:82(note/p)
 msgid ""
 "This will be the name of the room you are going to have a conversation. This "
 "name will be publicly available for other people to join. It is not possible "
@@ -1906,7 +1875,7 @@ msgstr ""
 "nombre estará públicamente disponible para que otras personas se unan. No es "
 "posible crear una sala privada."
 
-#: C/group-conversations.page:90(p)
+#: C/group-conversations.page:90(item/p)
 msgid ""
 "To invite other contacts to join the group conversation, from the "
 "<gui>Contact List</gui> window, select the contact you want to invite, and "
@@ -1916,13 +1885,13 @@ msgstr ""
 "ventana <gui>Lista de contactos</gui> seleccione el contacto al que quiere "
 "invitar y realice una de las siguientes acciones:"
 
-#: C/group-conversations.page:97(p)
+#: C/group-conversations.page:97(item/p)
 msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre el contacto y elija <gui>Invitar "
 "a la sala de chat</gui>."
 
-#: C/group-conversations.page:102(p)
+#: C/group-conversations.page:102(item/p)
 msgid ""
 "Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</"
 "gui></guiseq>."
@@ -1930,7 +1899,7 @@ msgstr ""
 "Elija <guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Invitar a la sala de "
 "chat</gui></guiseq>."
 
-#: C/group-conversations.page:107(p)
+#: C/group-conversations.page:107(item/p)
 msgid ""
 "If you have more than one group conversation open, select the one you want "
 "to invite your contacts."
@@ -1938,21 +1907,21 @@ msgstr ""
 "Si tiene más de una conversación en grupo abierta, seleccione en la quiere "
 "invitar a sus contactos."
 
-#: C/group-conversations.page:118(title)
+#: C/group-conversations.page:118(section/title)
 msgid "Join a group conversation"
 msgstr "Unirse a una conversación en grupo"
 
-#: C/group-conversations.page:128(p)
+#: C/group-conversations.page:128(item/p)
 msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
 msgstr ""
 "Expanda la sección <gui>Lista de salas</gui> para ver todas las salas "
 "existentes."
 
-#: C/group-conversations.page:133(p)
+#: C/group-conversations.page:133(item/p)
 msgid "Double-click on the name of a room to join it."
 msgstr "Pulse dos veces sobre el nombre de una sala a la que quiera unirse."
 
-#: C/group-conversations.page:139(p)
+#: C/group-conversations.page:139(section/p)
 msgid ""
 "It is not possible to join all existing rooms. Some of the rooms might "
 "require a password, or might be invitation only. <app>Empathy</app> does not "
@@ -1962,1487 +1931,1744 @@ msgstr ""
 "requerir una contraseña o pueden ser de sólo invitación. <app>Empathy</app> "
 "no soporta este tipo de salas."
 
-#: C/geolocation-what-is.page:9(desc)
-msgid "Understanding geolocation."
-msgstr "Entender la geolocalización"
+#: C/hide-contacts.page:8(info/desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr ""
+"Ocultar los contactos desconectados de su <gui>Lista de contactos</gui>."
 
-#: C/geolocation-what-is.page:33(title)
-msgid "What is geolocation"
-msgstr "¿Qué es la geolocalización?"
+#: C/hide-contacts.page:19(page/title)
+msgid "Hide offline contacts"
+msgstr "Ocultar contactos desconectados"
 
-#: C/geolocation-what-is.page:35(p)
+#: C/hide-contacts.page:21(page/p)
 msgid ""
-"Geolocation allows you to identify the real geographical location of a "
-"computer or a device connected to the Internet."
+"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
+"with which you can have a conversation, and also those that are offline."
 msgstr ""
-"La geolocalización le permite identificar la ubicación geográfica real de un "
-"equipo o un dispositivo conectado a internet."
-
-#: C/geolocation-what-is.page:37(p)
-msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr "Con la geolocalización de <app>Empathy</app> puede:"
-
-#: C/geolocation-what-is.page:42(p)
-msgid "Publish your geographical location to your contacts."
-msgstr "Publicar su información geográfica a sus contactos."
+"Generalmente <app>Empathy</app> muestra todos contactos: los que están "
+"conectados, con los que puede establecer una conversación, y también los que "
+"están desconectados."
 
-#: C/geolocation-what-is.page:47(p)
-msgid "See your contacts’ geographical location and quickly contact them."
-msgstr ""
-"Vea la ubicación geográfica de sus contactos y contacte con ellos "
-"rápidamente."
+#: C/hide-contacts.page:25(page/p)
+msgid "To hide the contacts that are offline:"
+msgstr "Para ocultar los contactos desconectados:"
 
-#: C/geolocation-what-is.page:52(p)
+#: C/hide-contacts.page:31(item/p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
+#| "gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</"
+#| "key><key>H</key></keyseq>."
 msgid ""
-"Set the accuracy of your location and the device used to discover your "
-"location."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui> "
+"<gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</key> "
+"<key>H</key></keyseq>."
 msgstr ""
-"Establezca la precisión de su ubicación y el dispositivo que usar para "
-"descubrir su ubicación."
+"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Ver</"
+"gui><gui>Contactos desconectados</gui></guiseq> o pulse <keyseq><key>Ctrl</"
+"key><key>H</key></keyseq>."
 
-#: C/geolocation-what-is.page:60(p)
-msgid ""
-"In order to see your contacts’ geographical locations, they need to use a "
-"service and an application that supports geolocation."
+#: C/hide-contacts.page:36(item/p)
+msgid "To show the offline contacts again, repeat the same procedure above."
 msgstr ""
-"Para poder ver las ubicaciones geográficas de sus contactos, éstos deben "
-"usar un servicio y una aplicación que soporte geolocalización."
+"Para mostrar los contactos desconectados de nuevo, repita el mismo "
+"procedimiento anterior."
 
-#: C/geolocation-turn.page:9(desc)
-msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr "Cómo activar y desactivar la geolocalización en <app>Empathy</app>."
+#: C/import-account.page:10(info/desc)
+msgid "Import an account from another instant messaging application."
+msgstr "Importar una cuenta de otra aplicación de mensajería instantánea."
 
-#: C/geolocation-turn.page:33(title)
-msgid "Activate/Deactivate geolocation"
-msgstr "Activar y desactivar la geolocalización"
+#: C/import-account.page:19(credit/name)
+msgid "Peter Haslam"
+msgstr "Peter Haslam"
 
-#: C/geolocation-turn.page:37(p)
-msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
-msgstr "Elija <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>."
+#: C/import-account.page:42(page/title)
+msgid "Import an existing account"
+msgstr "Importar una cuenta existente"
 
-#: C/geolocation-turn.page:42(p)
-msgid "Select the <gui>Location</gui> tab."
-msgstr "Seleccione la pestaña <gui>Ubicación geográfica</gui>."
+#: C/import-account.page:44(page/p)
+msgid ""
+"The first time you run <app>Empathy</app>, it will offer to import your "
+"accounts from other instant messaging applications. Currently, the only "
+"supported application is <app>Pidgin</app>."
+msgstr ""
+"La primera vez que ejecuta <app>Empathy</app> se le ofrecerá importar sus "
+"cuentas de otras aplicaciones de mensajería instantánea. Actualmente la "
+"única aplicación soportada es <app>Pidgin</app>."
 
-#: C/geolocation-turn.page:47(p)
+#: C/import-account.page:50(item/p)
 msgid ""
-"Select <gui>Publish location to my contacts</gui> to activate geolocation."
+"Run <app>Empathy</app> for the first time. An assistant will offer you a "
+"number of options to create new accounts."
 msgstr ""
-"Seleccione <gui>Publicar mi ubicación a mis contactos</gui> para activar la "
-"geolocalización."
+"Ejecute <app>Empathy</app> por primera vez. un asistente le ofrecerá un "
+"número de opciones para crear cuentas nuevas."
 
-#: C/geolocation-turn.page:50(p)
-msgid "To deactivate geolocation, deselect it."
-msgstr "Para desactivar la geolocalización, deselecciónela."
+#: C/import-account.page:54(item/p)
+msgid ""
+"Select <gui>Yes, import my account details from</gui> and click "
+"<gui>Forward</gui>."
+msgstr ""
+"Seleccione <gui>Sí, importar los detalles de mi cuenta desde</gui> y pulse "
+"<gui>Siguiente</gui>."
+
+#: C/import-account.page:58(item/p)
+msgid "Select the check box next to each account you wish to import."
+msgstr ""
+"Seleccione la casilla de verificación junto a cada cuenta que quiera "
+"importar."
 
-#: C/geolocation-turn.page:55(p)
+#: C/import-account.page:66(note/p)
 msgid ""
-"To increase the accuracy of your position, deselect <gui>Reduce location "
-"accuracy</gui>."
+"It is not currently possible to import accounts after you have completed the "
+"first-run assistant."
 msgstr ""
-"Para aumentar la precisión de su posición, deseleccione <gui>Reducir la "
-"precisión de la ubicación</gui>."
+"Actualmente no es posible importar cuentas después de haber completado el "
+"asistente de primera ejecución."
 
-#: C/geolocation-turn.page:61(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/introduction.page:41(media)
+#| msgid ""
+#| "@@image: 'figures/empathy-main-window.png'; "
+#| "md5=54908dcb2588beddb15ef0968d2c2582"
+msgctxt "_"
 msgid ""
-"If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <gui>Location sources</gui> "
-"section."
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
 msgstr ""
-"Si tiene un dispositivo externo como un GPS y quiere enviar una posición más "
-"precisa, seleccione la opción apropiada en la sección <gui>Orígenes de las "
-"ubicaciones</gui>."
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
 
-#: C/geolocation-supported.page:7(desc)
-msgid "Services that supports geolocation and compatibility."
-msgstr "Servicios que soportan geolocalización y compatibilidad."
+#: C/introduction.page:9(info/desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "Introducción al programa de mensajería instantánea <app>Empathy</app>."
 
-#: C/geolocation-supported.page:31(title)
-msgid "Supported services"
-msgstr "Servicios soportados"
+#: C/introduction.page:21(page/title)
+msgid "Introduction"
+msgstr "Introducción"
 
-#: C/geolocation-supported.page:33(p)
+#: C/introduction.page:23(page/p)
 msgid ""
-"The geolocation feature at the moment is compatible only with the Jabber "
-"service. In order to use it, you and your contacts need to have a Jabber "
-"account."
+"<app>Empathy</app> is an instant messaging application for the GNOME "
+"Desktop. It supports text messaging, voice &amp; video calls, file "
+"transfers, and all the most used messaging systems such as MSN and Google "
+"Talk."
 msgstr ""
-"Por el momento la característica de geolocalización sólo es compatible con "
-"el servicio Jabber. Para usarla usted y sus contactos deben tener una cuenta "
-"Jabber."
+"<app>Empathy</app> es una aplicación de mensajería instantánea para el "
+"Escritorio GNOME. soporte mensajes de texto, llamadas de voz y "
+"vídeollamadas, transferencias de archivos y los sistemas de mensajería más "
+"populares como MSN y Google Talk."
 
-#: C/geolocation-supported.page:39(p)
+#: C/introduction.page:28(page/p)
 msgid ""
-"It is necessary that also the server you are using supports the geolocation "
-"feature. Most of the Jabber servers support it. See your service website "
-"documentation for more information."
+"<app>Empathy</app> includes features that help you better collaborate while "
+"at work, and that let you easily keep in touch with your friends."
 msgstr ""
-"Es necesario que también el servidor que está usando soporte la "
-"característica de geolocalización. La mayoría de los servidores Jabber la "
-"soporta. Para obtener más información consulte la documentación en la página "
-"web de su servicio."
-
-#: C/geolocation-supported.page:47(title)
-msgid "Compatibility"
-msgstr "Compatibilidad"
+"<app>Empathy</app> incluye características que le ayudarán a colaborar mejor "
+"en el trabajo y le permitirán mantener en contacto con sus amigos fácilmente."
 
-#: C/geolocation-supported.page:49(p)
+#: C/introduction.page:32(page/p)
 msgid ""
-"<app>Empathy</app> geolocation feature is not compatible with other "
-"geographical position services such as <em>Google Latitude</em>, <em>Yahoo "
-"Fire Eagle</em> or <em>Brightkite</em>."
+"Using <app>Empathy</app>, you can group all the conversations in a single "
+"window, have multiple windows for different kind of conversations, easily "
+"search through your previous conversations, and share your desktop in just "
+"two clicks."
 msgstr ""
-"La característica de geolocalización de <app>Empathy</app> no es compatible "
-"con otros servicios de posición geográfica tales como <em>Google Latitude</"
-"em>, <em>Yahoo Fire Eagle</em> o <em>Brightkite</em>."
+"Usando <app>Empathy</app> puede agrupar las conversaciones en una sola "
+"ventana o tener múltiples ventanas para los diferentes tipos de "
+"conversaciones; búsqueda fácil de sus conversaciones anteriores y "
+"compartición de su escritorio con sólo un par de pulsaciones de ratón."
 
-#: C/geolocation-privacy.page:8(desc)
-msgid "What information are sent and to who."
-msgstr "Qué información se envía y a quién."
+#: C/introduction.page:39(figure/title)
+msgid "<gui>Contact List</gui> window"
+msgstr "Ventana de <gui>Lista de contactos</gui>"
 
-#: C/geolocation-privacy.page:32(title)
-msgid "Geolocation Privacy"
-msgstr "Privacidad en la geolocalización"
+#: C/introduction.page:40(figure/desc)
+msgid "<app>Empathy</app> main window"
+msgstr "Ventana principal de <app>Empathy</app>"
 
-#: C/geolocation-privacy.page:35(title)
-msgid "What information is sent"
-msgstr "Qué información se envía"
+#: C/introduction.page:42(media/p)
+msgid "<app>Empathy</app> main window."
+msgstr "Ventana principal de <app>Empathy</app>."
 
-#: C/geolocation-privacy.page:36(p)
+#: C/irc-commands.page:7(info/desc)
+msgid "The supported IRC commands."
+msgstr "Los comandos de IRC soportados."
+
+#: C/irc-commands.page:18(page/title)
+msgid "Supported IRC commands"
+msgstr "Comandos IRC soportados"
+
+#: C/irc-commands.page:19(page/p)
 msgid ""
-"What is possible to send is: your country, region, locality, area, street, "
-"building, floor, room, and postal code, longitude, latitude and altitude, "
-"speed and bearing."
+"To see the list of the supported IRC commands, in a chat room type <input>/"
+"help</input> and press <key>Enter</key>."
 msgstr ""
-"Es posible enviar: su país, región, localidad, área, calle, edificio, "
-"planta, habitación, código postal, longitud y altitud, velocidad y "
-"orientación."
+"Para ver una lista de los comandos de IRC soportados, en una sala de chat "
+"escriba <input>/help</input> y pulse <key>Intro</key> "
 
-#: C/geolocation-privacy.page:40(p)
-msgid ""
-"The accuracy and the quantity of information about your geographical "
-"position are based on the software or on the infrastructure used to discover "
-"your position."
+#: C/irc-commands.page:24(note/p)
+msgid "All commands available have a small description on their usage."
 msgstr ""
-"La precisión y cantidad de información acerca de su posición geográfica se "
-"basa en el software o en la infraestructura usada para descubrir su posición."
+"Todos los comandos disponibles tienen una pequeña descripción acerca de su "
+"uso."
 
-#: C/geolocation-privacy.page:44(p)
+#: C/irc-join-pwd.page:9(info/desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Introduzca la contraseña para salas de chat IRC protegidas."
+
+#: C/irc-join-pwd.page:25(page/title)
+msgid "Join a protected IRC chat room"
+msgstr "Unirse a una sala de chat protegida en el IRC"
+
+#: C/irc-join-pwd.page:27(page/p)
 msgid ""
-"Different kind of networks may have different accuracy settings, and may "
-"send different information. The use of external devices such as GPS or "
-"mobile phone will increase the accuracy of the information sent."
+"On some IRC networks, private IRC rooms may be protected with a password. If "
+"you know the password, use the following steps to join:"
 msgstr ""
-"Diferentes tipos de redes pueden tener diferentes ajustes de precisión y "
-"pueden enviar diferente información. El uso de dispositivos externos tales "
-"como un GPS o teléfono móvil puede aumentar la precisión de la información "
-"enviada."
+"En algunas redes IRC las salas privadas de IRC pueden estar protegidas por "
+"contraseña. Si sabe la contraseña, realice los siguientes pasos para unirse:"
 
-#: C/geolocation-privacy.page:49(p)
+#: C/irc-join-pwd.page:33(item/p)
+msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
+msgstr "<link xref=\"irc-join-room\">Unirse a la sala</link> de forma normal."
+
+#: C/irc-join-pwd.page:38(item/p)
 msgid ""
-"When the privacy mode is enabled, nothing more precise than your city will "
-"be sent, even if you are using an external device."
+"Empathy will prompt you for a password. Enter the password for the IRC chat "
+"room and click <gui style=\"button\">Join</gui>."
 msgstr ""
-"Cuando el modo de privacidad está activado, no se enviará nada más preciso "
-"que la ciudad, incluso si está usando un dispositivo externo."
+"Empathy le preguntará la contraseña. Introduzca la contrseña para la sala de "
+"chat IRC y pulse <gui style=\"button\">Unirse</gui>."
 
-#: C/geolocation-privacy.page:56(title)
-msgid "Who can see the information sent"
-msgstr "Quién puede ver la información enviada"
+#: C/irc-join-room.page:8(info/desc)
+msgid "Join an IRC channel."
+msgstr "Entrar en un canal IRC."
 
-#: C/geolocation-privacy.page:57(p)
-msgid "Only your contacts can see your geographical position."
-msgstr "Sólo sus contactos pueden ver su posición geográfica."
+#: C/irc-join-room.page:31(page/title)
+msgid "Join an IRC chat room"
+msgstr "Unirse a una sala en el IRC"
 
-#: C/geolocation-privacy.page:63(title)
-msgid "What is the privacy mode"
-msgstr "Cuál es el modo de privacidad"
+#: C/irc-join-room.page:33(page/p)
+msgid ""
+"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
+"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
+"account\"/> and <link xref=\"account-irc\"/>."
+msgstr ""
+"Puede unirse a salas de chat IRC (también conocidos como canales de IRC) en "
+"cualquier red de IRC a la que esté conectado. Para conectarse a una red de "
+"IRC consulte la <link xref=\"add-account\"/> y la <link xref=\"account-irc\"/"
+">."
 
-#: C/geolocation-privacy.page:64(p)
+#: C/irc-join-room.page:45(item/p)
 msgid ""
-"The privacy mode, enabled by default, is a reduced accuracy mode that will "
-"decrease the accuracy of the geographical position sent to your contacts."
+"From the <gui>Account</gui> drop-down list, select the IRC account that "
+"corresponds to the network you want to use."
 msgstr ""
-"El modo de privacidad, activado de forma predeterminada, es un modo de "
-"precisión reducida de la información de posición geográfica enviada a sus "
-"contactos."
+"Desde la lista desplegable <gui>Cuenta</gui> elija la cuenta IRC que "
+"corresponda con la red que quiere usar."
 
-#: C/geolocation-privacy.page:71(title)
-msgid "Privacy overview"
-msgstr "Visión general de la privacidad"
+#: C/irc-join-room.page:51(item/p)
+msgid ""
+"In the <gui>Room</gui> text box, type the name of the channel you want to "
+"join. IRC channel names start with the hash character (<sys>#</sys>)."
+msgstr ""
+"En la caja de texto <gui>Sala</gui>, escriba el nombre del canal de IRC al "
+"que quiere unirse. Preceda el nombre con el carácter almohadilla (<sys>#</"
+"sys>)."
 
-#: C/geolocation-privacy.page:72(p)
+#: C/irc-join-room.page:57(item/p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "Pulse <gui>Unirse</gui> para entrar en la sala."
+
+#: C/irc-join-room.page:64(note/p)
 msgid ""
-"Overview of the various geolocation privacy settings in <app>Empathy</app>."
+"To join multiple rooms, you need to repeat the steps above for each room."
 msgstr ""
-"Visión general de los ajustes de privacidad en la geolocalización de "
-"<app>Empathy</app>."
+"Para entrar en varias salas, debe repetir los pasos anteriores para cada "
+"sala."
 
-#: C/geolocation-privacy.page:77(p)
-msgid "Geolocation is not enabled by default."
-msgstr "De forma predeterminada la geolocalización no está activada."
+#: C/irc-manage.page:9(info/desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "Cómo usar el IRC con <app>Empathy</app>."
 
-#: C/geolocation-privacy.page:82(p)
-msgid "Privacy mode is enabled by default."
-msgstr "De forma predeterminada está activado el modo de privacidad."
+#: C/irc-manage.page:34(page/title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
 
-#: C/geolocation-privacy.page:87(p)
+#: C/irc-manage.page:41(when/p)
 msgid ""
-"Privacy mode prevails even when using external and more precise devices."
+"<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button"
+"\">Install telepathy-idle</link>"
 msgstr ""
-"El modo de privacidad prevalece incluso cuando se está usando dispositivos "
-"externos más precisos."
+"<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button"
+"\">Instalar telepathy-idle</link>"
 
-#: C/geolocation-privacy.page:92(p)
-msgid "Only your contacts can see your position."
-msgstr "Sólo sus contactos pueden ver su posición."
+#: C/irc-manage.page:48(info/title)
+#| msgid "IRC Chat Rooms and Conversations"
+msgctxt "link"
+msgid "IRC Chat Rooms and Conversations"
+msgstr "Salas de chat y conversaciones en el IRC"
 
-#: C/geolocation-not-showing.page:8(desc)
-msgid "<app>Empathy</app> does not publish my geographical position."
-msgstr "<app>Empathy</app> no publica mi posición geográfica."
+#: C/irc-manage.page:50(section/title)
+msgid "Chat Rooms and Conversations"
+msgstr "Salas de chat y conversaciones"
 
-#: C/geolocation-not-showing.page:32(title)
-msgid "Geographical position not published"
-msgstr "Posición geográfica no publicada"
+#: C/irc-manage.page:55(info/title)
+#| msgid "Common IRC Problems"
+msgctxt "link"
+msgid "Common IRC Problems"
+msgstr "Problemas comunes en el IRC"
+
+#: C/irc-nick-password.page:10(info/desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
+msgstr "Proteja su apodo para prevenir que otros usuarios del IRC lo usen."
+
+#: C/irc-nick-password.page:33(page/title)
+msgid "Use a nickname password on IRC"
+msgstr "Usar una contraseña para un apodo en el IRC"
 
-#: C/geolocation-not-showing.page:34(p)
+#: C/irc-nick-password.page:35(page/p)
 msgid ""
-"If your contacts cannot see your location, <app>Empathy</app> might not be "
-"able to discover with a good margin of precision your geographical position."
+"On some IRC networks, you can register your nickname with a service called "
+"NickServ. By sending special messages to NickServ, you can set your password "
+"and identify yourself. Some IRC chat rooms may not allow you to join without "
+"a registered nickname."
 msgstr ""
-"Si sus contactos no ven su posición, <app>Empathy</app> puede no ser capaz "
-"de descubrir su posición geográfica con un buen margen de precisión."
+"En algunas redes de IRC puede registrar su apodo con un servicio llamado "
+"NickServ. Enviando mensajes especiales a NickServ puede configurar su "
+"contraseña e identificarse. Puede que algunas salas de chat IRC no le "
+"permitan unirse sin un nombre registrado."
 
-#: C/geolocation-not-showing.page:38(p)
+#: C/irc-nick-password.page:40(page/p)
 msgid ""
-"In this case, your position will not be published, but you are still able to "
-"see the location of your contacts."
+"<app>Empathy</app> does not currently support nickname registration. Some "
+"IRC networks, however, will automatically forward a <em>server password</em> "
+"to NickServ. On these networks, you can use the IRC password in "
+"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
+"network is known to have this feature."
 msgstr ""
-"En este caso no se publicará su posición pero aún podrá ver la posición de "
-"sus contactos."
+"Actualmente <app>Empathy</app> no soporta el registro de apodos. No obstante "
+"algunos servidores de IRC reenviarán automáticamente una <em>contraseña de "
+"servidor</em> a NickServ. En esas redes podrá usar contraseñas de IRC en "
+"<app>Empathy</app> para identificarse contra NickServ. Se sabe que la "
+"popular red freenode dispone de esta característica."
 
-#: C/geolocation-not-showing.page:42(p)
-msgid ""
-"If you want to publish your geographical position, you can try to use an "
-"external device such as a GPS."
+#: C/irc-nick-password.page:46(page/p)
+msgid "To set an IRC server password:"
+msgstr "Para establecer una contraseña de servidor de IRC:"
+
+#: C/irc-nick-password.page:54(item/p)
+msgid "Select the IRC account from the list on the left of the dialog."
 msgstr ""
-"Si quiere publicar su posición geográfica puede intentar usar un dispositivo "
-"externo tal como un GPS."
+"Seleccione la cuenta de IRC de la lista en la parte izquierda del diálogo."
 
-#: C/geolocation-not-showing.page:48(p)
+#: C/irc-nick-password.page:57(item/p)
 msgid ""
-"In order to publish your geographical location, your Jabber server needs to "
-"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
-"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
-"PEP</link> is maintained online. Google Talk does not support this feature "
-"at this time."
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
 msgstr ""
-"Para publicar su ubicación geográfica su servidor Jabber debe soportar el "
-"protocolo de eventos personales (PEP). Una lista de los <link href=\"http://"
-"coccinella.im/servers/servers_by_pubsub_pep.html\">servidores que soportan "
-"PEP</link> se mantiene en línea. Por el momento Google Talk no soporta esta "
-"característica."
-
-#: C/geolocation.page:8(desc)
-msgid "Use and understand geolocation in <app>Empathy</app>."
-msgstr "Usar y entender la geolocalización en <app>Empathy</app>."
+"En la caja de texto <gui>Contraseña</gui> escriba la contraseña que quiere "
+"usar para registrar su apodo."
 
-#: C/geolocation.page:32(title)
-msgid "Geographical position"
-msgstr "Posición geográfica"
+#: C/irc-nick-password.page:69(note/p)
+msgid ""
+"These instructions only allow you to use a password-protected nickname on "
+"certain IRC networks. It is not currently possible to register an IRC "
+"nickname or change your nickname password using <app>Empathy</app>."
+msgstr ""
+"Estas instrucciones sólo le permiten usar un apodo protegido por contraseña "
+"en ciertas redes de IRC. Actualmente no es posible registrar un apodo IRC o "
+"cambiar la contraseña de su apodo con <app>Empathy</app>."
 
-#: C/geolocation.page:35(title)
-msgid "Geolocation"
-msgstr "Geolocalización"
+#: C/irc-send-file.page:9(info/desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr ""
+"Actualmente <app>Empathy</app> no soporta enviar archivos a través del IRC."
 
-#: C/geolocation.page:39(title)
-msgid "Fix common problems"
-msgstr "Solucionar problemas comunes"
+#: C/irc-send-file.page:31(page/title)
+msgid "Send files over IRC"
+msgstr "Enviar archivos a través del IRC"
 
-#: C/favorite-rooms.page:10(desc)
-msgid "Set, join and manage favorite rooms."
-msgstr "Configurar, unirse a y gestionar salas favoritas."
+#: C/irc-send-file.page:33(page/p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "Actualmente no es posible enviar archivos a través del IRC."
 
-#: C/favorite-rooms.page:29(title)
-msgid "Favorite rooms"
-msgstr "Salas favoritas"
+#: C/irc-start-conversation.page:8(info/desc)
+msgid "Start a conversation with an IRC contact."
+msgstr "Iniciar una conversación con un contacto del IRC."
 
-#: C/favorite-rooms.page:32(title)
-msgid "Set a room as a favorite"
-msgstr "Establecer una sala como favorita"
+#: C/irc-start-conversation.page:30(page/title)
+msgid "Chat with somebody on IRC"
+msgstr "Charlar con alguien en el IRC"
 
-#: C/favorite-rooms.page:35(p)
-msgid "Join a room."
-msgstr "Unirse a una sala."
+#: C/irc-start-conversation.page:32(page/p)
+msgid ""
+"You can hold private conversations with other IRC users, outside of the "
+"public IRC chat rooms. To start a conversation with another IRC user:"
+msgstr ""
+"Puede mantener conversaciones privadas con otros usuarios del IRC, fuera de "
+"las salas públicas del IRC. Para iniciar una conversación con otro usuario "
+"del IRC:"
 
-#: C/favorite-rooms.page:40(p)
+#: C/irc-start-conversation.page:37(item/p)
 msgid ""
-"See <link xref=\"irc-join-room\"/> for more information on how to join an "
-"IRC room."
+"In the contact list for an IRC chat room, double click the name of the user "
+"you want to chat with. Alternatively, right click the name of the user and "
+"choose <gui>Chat</gui>."
 msgstr ""
-"Para obtener más información acerca de cómo unirse a una sala de chat IRC, "
-"consulte la <link xref=\"irc-join-room\"/>."
+"En la lista de contactos para la sala de chat del IRC, pulse dos veces en el "
+"nombre del usuario con el que quiere charlar. Alternativamente, pulse con el "
+"botón derecho del ratón sobre el nombre del usuario y elija <gui>Chat</gui>."
 
-#: C/favorite-rooms.page:46(p)
+#: C/irc-start-conversation.page:45(item/p)
 msgid ""
-"See <link xref=\"group-conversations\"/> for more information on how to "
-"start or join a group conversation."
+"The IRC room contact list is not the same as <app>Empathy</app> contact "
+"list. It contains a list of users in the IRC chat room you joined. Different "
+"rooms can have different contacts listed."
 msgstr ""
-"Para obtener más información acerca de cómo unirse a una conversación en "
-"grupo, consulte la <link xref=\"group-conversations\"/>."
+"La lista de contactos de la sala IRC no es igual que la lista de contactos "
+"de <app>Empathy</app>. Contiene una lista de usuarios en la sala de chat del "
+"IRC a la que se ha unido. Salas diferentes pueden tener diferentes listados "
+"de contactos."
 
-#: C/favorite-rooms.page:54(p)
+#: C/irc-start-conversation.page:52(item/p)
 msgid ""
-"From the conversation window, choose <guiseq><gui>Conversation</"
-"gui><gui>Favorite Chat Room</gui></guiseq>."
+"The IRC room contact list is usually on the right side of the IRC room "
+"window. If you do not see it, choose <guiseq><gui>Conversation</"
+"gui><gui>Show Contact List</gui></guiseq>."
 msgstr ""
-"Desde la ventana de conversación, elija <guiseq><gui>Conversación</"
-"gui><gui>Sala de chat favorita</gui></guiseq>."
+"La lista de contactos de una sala IRC generalmente está en la parte derecha "
+"de la ventana de la sala del IRC. Si no la ve elija "
+"<guiseq><gui>Conversación</gui><gui>Mostrar lista de contactos</gui></"
+"guiseq>."
 
-#: C/favorite-rooms.page:63(title)
-msgid "Join favorite rooms"
-msgstr "Unirse a las salas favoritas"
+#: C/license.page:8(info/desc)
+msgid "Legal information."
+msgstr "Información legal."
 
-#: C/favorite-rooms.page:71(p)
-msgid "Press <key>F5</key>."
-msgstr "Pulse <key>F5</key>."
+#: C/license.page:11(page/title)
+msgid "License"
+msgstr "Licencia"
 
-#: C/favorite-rooms.page:76(p)
+#: C/license.page:12(page/p)
 msgid ""
-"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
-"all your favorite rooms."
+"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license."
 msgstr ""
-"Elija <guiseq><gui>Salas</gui><gui>Unirse a las favoritas</gui></guiseq> "
-"para unirse a todas sus salas favoritas."
+"Este trabajo está licenciado bajo una Licencia Creative Commons Atribución - "
+"Compartir igual 3.0 sin soporte."
 
-#: C/favorite-rooms.page:82(p)
-msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
-msgstr ""
-"Elija <gui>Sala</gui> y seleccione la sala favorita a la que quiere unirse."
+#: C/license.page:20(page/p)
+msgid "You are free:"
+msgstr "Es libre de:"
 
-#: C/favorite-rooms.page:90(p)
-msgid ""
-"To join a favorite room, you need to be connected to the Internet and to "
-"your account."
-msgstr ""
-"Para unirse a una sala favorita debe estar conectado a Internet y con la "
-"cuenta."
+#: C/license.page:25(item/title)
+#| msgid "To share"
+msgid "<em>To share</em>"
+msgstr "<em>Compartir</em>"
 
-#: C/favorite-rooms.page:98(title)
-msgid "Manage favorite rooms"
-msgstr "Gestionar las salas favoritas"
+#: C/license.page:26(item/p)
+msgid "To copy, distribute and transmit the work."
+msgstr "Copiar, distribuir y comunicar públicamente la obra"
 
-#: C/favorite-rooms.page:101(p)
-msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Manage Favorites</gui></guiseq>."
-msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Sala</"
-"gui><gui>Gestionar salas favoritas</gui></guiseq>."
+#: C/license.page:29(item/title)
+#| msgid "To remix"
+msgid "<em>To remix</em>"
+msgstr "<em>Hacer obras derivadas</em>"
+
+#: C/license.page:30(item/p)
+msgid "To adapt the work."
+msgstr "Adaptar el trabajo."
+
+#: C/license.page:33(page/p)
+msgid "Under the following conditions:"
+msgstr "Bajo las siguientes condiciones:"
 
-#: C/favorite-rooms.page:107(p)
+#: C/license.page:38(item/title)
+#| msgid "Attribution"
+msgid "<em>Attribution</em>"
+msgstr "<em>Atribucio�n</em>"
+
+#: C/license.page:39(item/p)
 msgid ""
-"From the <gui>Account</gui> drop-down list, select the account you want to "
-"manage the favorite rooms of."
+"You must attribute the work in the manner specified by the author or "
+"licensor (but not in any way that suggests that they endorse you or your use "
+"of the work)."
 msgstr ""
-"Desde la lista desplegable <gui>Cuenta</gui> seleccione la cuenta de la que "
-"quiere gestionar las salas favoritas."
+"Debe reconocer los créditos de la obra de la manera especificada por el "
+"autor o el licenciador (pero no de una manera que sugiera que tiene su apoyo "
+"o apoyan el uso que hace de su obra)."
 
-#: C/favorite-rooms.page:111(p)
-msgid "Select <gui>All</gui> to see all you favorite rooms."
-msgstr "Pulse <gui>Todas</gui> para entrar en todas sus salas favoritas."
+#: C/license.page:46(item/title)
+#| msgid "Share Alike"
+msgid "<em>Share Alike</em>"
+msgstr "<em>Compartir igual</em>"
 
-#: C/favorite-rooms.page:116(p)
-msgid "Select the favorite room you want to manage:"
-msgstr "Seleccione la sala favorita que quiere gestionar:"
+#: C/license.page:47(item/p)
+msgid ""
+"If you alter, transform, or build upon this work, you may distribute the "
+"resulting work only under the same, similar or a compatible license."
+msgstr ""
+"Si transforma o modifica esta obra para crear una obra derivada, sólo puede "
+"distribuir la obra resultante bajo la misma licencia, una de similar o una "
+"de compatible."
 
-#: C/favorite-rooms.page:121(p)
+#: C/license.page:53(page/p)
 msgid ""
-"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
-"that room when you connect to your account."
+"For the full text of the license, see the <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
+"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
+"sa/3.0/\">Commons Deed</link>."
 msgstr ""
-"Seleccione la casilla de verificación <gui>Autoconectar</gui> para unirse a "
-"esa sala automáticamente al conectarse con la cuenta."
+"Para ver el texto completo de la licencia consulte la <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode/\">página web de Creative "
+"Commons</link> o lea el<link href=\"http://creativecommons.org/licenses/by-"
+"sa/3.0/\">Escrito de Commons</link>."
 
-#: C/favorite-rooms.page:127(p)
-msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
-msgstr "Pulse <gui>Quitar</gui> para quitar la sala de sus favoritas."
+#: C/link-contacts.page:11(info/desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Unir y separar diferentes contactos en uno solo."
 
-#: C/favorite-rooms.page:134(p)
-msgid "When done, click <gui>Close</gui>."
-msgstr "Cuando haya terminado pulse <gui>Cerrar</gui>."
+#: C/link-contacts.page:25(page/title)
+msgid "Combine and separate contacts"
+msgstr "Combinar y separar contactos"
 
-#: C/disable-account.page:9(desc)
-msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+#: C/link-contacts.page:26(page/p)
+msgid ""
+"If one, or more, of your contacts has multiple accounts with different "
+"messaging services, you can combine these contacts into a single one."
 msgstr ""
-"Evitar que <app>Empathy</app> inicie sesión automáticamente en una cuenta."
-
-#: C/disable-account.page:40(title)
-msgid "Disable an account"
-msgstr "Desactivar una cuenta"
+"Si uno o más de sus contactos tiene múltiples cuentas con diferentes "
+"servicios de mensajería, puede combinar esos contactos en uno solo."
 
-#: C/disable-account.page:42(p)
+#: C/link-contacts.page:30(page/p)
 msgid ""
-"You can disable an account to prevent <app>Empathy</app> from logging in to "
-"it without removing the account entirely. You may wish to disable and re-"
-"enable an account if you only want to be logged in to the account at certain "
-"times, but you still want to use <app>Empathy</app> for other accounts."
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
 msgstr ""
-"Puede desactivar una cuenta para evitar que <app>Empathy</app> inicie sesión "
-"en ella, sin tener que quitar la cuenta completamente. Puede querer "
-"desactivar una cuenta y reactivarla si sólo quiere iniciar sesión en la "
-"cuenta de vez en cuando, pero sigue queriendo usar <app>Empathy</app> para "
-"otras cuentas."
+"Al contacto resultante se le llama <em>metacontacto</em>: un contacto "
+"compuesto de diferentes contactos simples."
 
-#: C/disable-account.page:53(p)
+#: C/link-contacts.page:34(page/p)
 msgid ""
-"Select the account you wish to disable from the accounts list on the left "
-"side of the window."
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
 msgstr ""
-"Seleccione la cuenta que quiere desactivar desde la lista de cuentas en la "
-"parte izquierda de la ventana."
+"Si tiene un contacto Juan Pérez que usa tres servicios de mensajería de "
+"contactos como:"
 
-#: C/disable-account.page:57(p)
-msgid "On the right side of the window, switch it off."
-msgstr "Desactívela en la parte derecha de la ventana,"
+#: C/link-contacts.page:40(item/p)
+msgid "janes@facebook"
+msgstr "juan@facebook"
 
-#: C/disable-account.page:62(p)
-msgid "To re-enable the account, switch it on."
-msgstr "Para reactivar la cuenta, actívela."
+#: C/link-contacts.page:45(item/p)
+msgid "jane.smith@gmail"
+msgstr "juan.perez@gmail"
 
-#: C/create-account.page:9(desc)
-msgid "Register for an account with one of the supported messaging services."
-msgstr "Registre una cuenta con uno de los servicios de mensajería soportados."
+#: C/link-contacts.page:50(item/p)
+msgid "jane_smith@hotmail"
+msgstr "juan_perez@hotmail"
 
-#: C/create-account.page:34(title)
-msgid "Register for a new account"
-msgstr "Registrar una cuenta nueva"
+#: C/link-contacts.page:55(page/p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "Puede combinar estos contactos en un solo Juan Pérez."
 
-#: C/create-account.page:36(p)
+#: C/link-contacts.page:60(section/title)
+msgid "Combining contacts"
+msgstr "Combinar contactos"
+
+#: C/link-contacts.page:63(item/p)
 msgid ""
-"Most account types require you to create an account with a account provider "
-"before you can connect using instant messaging applications like "
-"<app>Empathy</app>. With some account providers, you can use <app>Empathy</"
-"app> to register for a new account, using the same steps as you would to "
-"<link xref=\"add-account\">add an account</link>."
+"From the <gui>Contact List</gui> window, right-click one of the contact that "
+"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
+"gui>."
 msgstr ""
-"Muchos tipos de cuenta requieren que cree una cuenta con un proveedor de "
-"cuentas antes de poder conectarse y usar aplicaciones de mensajería "
-"instantánea como <app>Empathy</app>. Con algunos proveedores de cuentas "
-"puede usar <app>Empathy</app> para registrar una cuenta nueva, usando los "
-"mismos pasos que seguiría en <link xref=\"add-account\">añadir una cuenta</"
-"link>."
+"Desde la ventana <gui>Lista de contactos</gui> pulse con el botón derecho "
+"uno de los contactos que tiene diferentes cuentas y seleccione <gui style="
+"\"menuitem\">Enlazar contactos...</gui>."
 
-#: C/create-account.page:42(p)
+#: C/link-contacts.page:70(item/p)
 msgid ""
-"This page provides information on creating a new account for various types "
-"of accounts. Your account provider should give you a login ID and a "
-"password, as well as any additional information you need to connect using "
-"<app>Empathy</app>."
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
 msgstr ""
-"Esta página proporciona información acerca de crear una cuenta nueva para "
-"varios tipos de cuenta. Su proveedor de cuentas debería proporcionarle un ID "
-"de inicio de sesión y una contraseña, así como otra información adicional "
-"que puede necesitar para conectarse con <app>Empathy</app>."
+"Desde el panel izquierdo, en la ventana <gui>Enlazar contatos</gui>, "
+"seleccione los contactos que quiere combinar."
 
-#: C/create-account.page:47(title)
-msgid "Facebook"
-msgstr "Facebook"
+#: C/link-contacts.page:76(item/p)
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Pulse <gui style=\"button\">Enlazar</gui>."
 
-#: C/create-account.page:48(p)
+#: C/link-contacts.page:82(note/p)
 msgid ""
-"Facebook is one of the most-used social networks. It allows users to create "
-"their own profile and to communicate with their friends."
+"When a meta-contact has been created, the default contact that will be used "
+"to have a conversation with when you double-click on it, is the contact with "
+"the highest presence on-line."
 msgstr ""
-"Facebook es una de las redes sociales más usadas. Permite a los usuarios "
-"crear su propio perfil y comunicarse con sus amigos."
+"Cuando se ha creado un metacontacto, el contacto predeterminado que se usará "
+"para tener una conversación al pulsar dos veces sobre él, es el último "
+"contacto con presencia en línea."
+
+#: C/link-contacts.page:91(section/title)
+msgid "Separating contacts"
+msgstr "Separar contactos"
 
-#: C/create-account.page:52(p)
+#: C/link-contacts.page:94(item/p)
 msgid ""
-"To use Facebook to communicate with your friends, you will need to create a "
-"new account from the website: <link href=\"http://www.facebook.com\">www."
-"facebook.com</link>."
+"From the <gui>Contact List</gui>, right-click the contact to separate, and "
+"select <gui style=\"menuitem\">Link Contacts...</gui>."
 msgstr ""
-"Para usar Facebook para comunicarse con sus amigos necesita crear una cuenta "
-"nueva desde el sitio web: <link href=\"http://www.facebook.com\">www."
-"facebook.com</link>."
+"Desde la ventana <gui>Lista de contactos</gui> pulse con el botón derecho "
+"del ratón para separar, y seleccione <gui style=\"menuitem\">Enlazar "
+"contactos...</gui>."
 
-#: C/create-account.page:60(title) C/audio-video.page:170(p)
-msgid "Jabber"
-msgstr "Jabber"
+#: C/link-contacts.page:100(item/p)
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Pulse <gui style=\"button\">Desenlazar</gui>."
 
-#: C/create-account.page:62(p)
-msgid ""
-"Jabber is an open instant messaging system. Like email, Jabber allows you to "
-"choose your account provider and communicate with all other Jabber users, "
-"regardless of their account provider."
-msgstr ""
-"Jabber es un sistema de mensajería instantánea abierto. Como el correo-e, "
-"Jabber le permite elegir su proveedor de la cuenta y comunicarse con otros "
-"usuarios de Jabber, independientemente del proveedor de la cuenta."
+#: C/prev-conv.page:8(info/desc)
+msgid "Browse or search your previous conversations."
+msgstr "Examinar o buscar en sus conversaciones anteriores"
 
-#: C/create-account.page:66(p)
+#: C/prev-conv.page:36(page/title)
+msgid "View previous conversations"
+msgstr "Ver conversaciones anteriores"
+
+#: C/prev-conv.page:38(page/p)
 msgid ""
-"You will need to create a new account with a Jabber provider. There are many "
-"free providers; one popular provider is <link href=\"http://register.jabber."
-"org/\">Jabber.org</link>."
+"<app>Empathy</app> automatically saves all your text conversations you have "
+"with your contacts. You can <link xref=\"#search\">search through all of "
+"your previous conversations</link> or <link xref=\"#browse\">browse previous "
+"conversations</link> by contact and date."
 msgstr ""
-"Deberá crear una cuenta nueva con un proveedor Jabber. Existen muchos "
-"proveedores libres; un proveedor popular es <link href=\"http://register."
-"jabber.org/\">Jabber.org</link>."
+"<app>Empathy</app> guarda automáticamente todas las conversaciones de texto "
+"que tiene con sus contactos. Puede <link xref=\"#search\">buscar a través de "
+"todas sus conversaciones anteriores</link> o <link xref=\"#browse\">buscar "
+"conversación anteriores</link> por contacto y fecha."
 
-#: C/create-account.page:71(p)
+#: C/prev-conv.page:46(note/p)
 msgid ""
-"If you use Google Mail or Google Talk, you already have a Jabber account. "
-"Google Talk is a Jabber service. Simply use your Google Mail address and "
-"password in <app>Empathy</app> to connect."
+"You do not need to be connected to the Internet to view and search your "
+"previous conversations."
 msgstr ""
-"Si usa Google Mail o Google Talk ya tiene una cuenta Jabber. Talk es un "
-"servicio Jabber. Simplemente use en <app>Empathy</app> su dirección de "
-"Google Mail y su contraseña para conectarse."
+"No necesita estar conectado a Internet para ver y buscar en sus "
+"conversaciones anteriores."
 
-#: C/create-account.page:78(title) C/audio-video.page:190(p)
-msgid "People Nearby"
-msgstr "Gente cerca"
+#: C/prev-conv.page:53(section/title)
+msgid "Search previous conversations"
+msgstr "Buscar conversaciones anteriores"
 
-#: C/create-account.page:80(p)
+#: C/prev-conv.page:55(section/p)
 msgid ""
-"You do not need to create an account with a service provider to use this "
-"feature. This service works whenever you are connected to a local network, "
-"such as a wireless hotspot. It automatically finds all other users on the "
-"network who are also using this service."
+"You can perform a full-text search through all of your previous "
+"conversations."
 msgstr ""
-"Para usar esta característica no necesita crear una cuenta con un proveedor "
-"de servicios. Este servicio funciona siempre que esté conectado a una red "
-"local, tal como un punto inalámbrico. Automáticamente encuentra otros "
-"usuarios en la red que estén usando este servicio."
+"Puede realizar una búsqueda de texto completo sobre todas sus conversaciones "
+"anteriores."
 
-#: C/create-account.page:85(p)
-msgid "For more information, see <link xref=\"salut-protocol\"/>."
+#: C/prev-conv.page:59(item/p) C/prev-conv.page:87(item/p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
+#| "gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
+#| "<key>F3</key>."
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui> "
+"<gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</"
+"key>."
 msgstr ""
-"Para obtener más información consulte la <link xref=\"salut-protocol\"/>."
-
-#: C/create-account.page:89(title) C/audio-video.page:205(p)
-msgid "SIP"
-msgstr "SIP"
+"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Ver</"
+"gui><gui>Conversaciones anteriores</gui></guiseq>. Alternativamente, pulse "
+"<key>F3</key>."
 
-#: C/create-account.page:91(p)
+#: C/prev-conv.page:63(item/p)
 msgid ""
-"SIP is an open system which allows users to have audio and video "
-"conversations over the Internet. You need to create an account with a SIP "
-"provider. You can communicate with all other SIP users, regardless of which "
-"SIP provider they use."
+"Select an account from the drop-down list in the top. A list of contacts and "
+"chat room for that account will be shown below."
 msgstr ""
-"SIP es un sistema abierto que permite a los usuarios realizar conversaciones "
-"de sonido y vídeo en Internet. Debe crear una cuenta con un proveedor SIP. "
-"Puede comunicarse con todos los usuarios SIP, independientemente del "
-"proveedor SIP que usen."
+"Seleccione una cuenta de la lista desplegable en la parte superior. Para esa "
+"cuenta se mostrará debajo una lista de contactos y una sala de chat."
 
-#: C/create-account.page:97(p)
+#: C/prev-conv.page:67(item/p)
 msgid ""
-"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
-"index.php?page=register\">Ekiga.net</link> service does not currently work "
-"with <app>Empathy</app>."
+"Type the text you want to search for in the <gui>Search</gui> text field."
 msgstr ""
-"Debido a algunas diferencias, actualmente el servicio libre <link href="
-"\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> no "
-"funciona con <app>Empathy</app>."
+"Escriba el texto que quiere buscar en el cuadro de texto <gui>Buscar</gui>"
 
-#: C/create-account.page:102(p)
+#: C/prev-conv.page:71(item/p)
 msgid ""
-"Some SIP providers allow you to call normal phones from your computer. "
-"Generally, you will need to subscribe to a paid service for this feature."
+"Any conversations that matched your search terms will be shown. By default, "
+"conversations are ordered by date."
 msgstr ""
-"Algunos proveedores SIP le permiten llamar a teléfonos normales desde su "
-"equipo. Generalmente deberá suscribirse a un servicio de pago para usar esta "
-"característica."
+"Se mostrará cualquier conversación que coincida con sus términos de "
+"búsqueda. Las conversaciones se ordenan por fecha de forma predeterminada."
 
-#: C/create-account.page:107(title) C/audio-video.page:165(p)
-msgid "IRC"
-msgstr "IRC"
+#: C/prev-conv.page:80(section/title)
+msgid "Browse previous conversations"
+msgstr "Examinar conversaciones anteriores"
 
-#: C/create-account.page:109(p)
+#: C/prev-conv.page:82(section/p)
 msgid ""
-"You do not need to register for an account to use IRC. Although you specify "
-"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
-"is only established each time you connect. If another user is using the "
-"nickname, you will need to choose a new nickname."
+"You can browse your previous conversations with your contacts or in chat "
+"rooms by date."
 msgstr ""
-"No necesita registrar una cuenta para usar el IRC. Aunque especifique un "
-"apodo al añadir una cuenta IRC en <app>Empathy</app>, este apodo sólo se "
-"establece cada vez que se conecta. Si otro usuario está usando el nombre, "
-"deberá elegir un apodo nuevo."
+"Puede examinar por fecha las conversaciones anteriores con sus contactos o "
+"en salas de chat."
 
-#: C/create-account.page:114(p)
+#: C/prev-conv.page:91(item/p)
 msgid ""
-"Some IRC networks use a service called NickServ to allow users to protect "
-"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
+"Select an account from the drop-down list in the top left. A list of "
+"contacts and chat room for that account will be shown below."
 msgstr ""
-"Algunas redes IRC usan un servicio llamado NickServ para permitir a los "
-"usuarios proteger sus apodos. Para obtener más información consulte la <link "
-"xref=\"irc-nick-password\"/>."
+"Seleccione una cuenta de la lista desplegable en la parte superior "
+"izquierda. Para esa cuenta se mostrará debajo una lista de contactos y una "
+"sala de chat."
 
-#: C/create-account.page:117(p)
+#: C/prev-conv.page:95(item/p)
 msgid ""
-"Some IRC servers are password protected. You will need to know the password "
-"to connect to these servers. Generally, these are private IRC networks."
+"Select a contact or chat room to view your previous conversations from. By "
+"default the most recent conversation will be shown."
 msgstr ""
-"Algunos servidores de IRC están protegidos con contraseña. Necesitará "
-"conocer la contraseña para conectarse a esos servidores. Generalmente son "
-"redes de IRC privadas."
-
-#: C/create-account.page:122(title)
-msgid "Proprietary Services"
-msgstr "Servicios propietarios"
+"Para ver sus conversaciones anteriores, seleccione un contacto o una sala de "
+"chat. De forma predeterminada se muestra la conversación más reciente."
 
-#: C/create-account.page:124(p)
+#: C/prev-conv.page:99(item/p)
 msgid ""
-"There are many proprietary instant messaging services that have been "
-"developed by different companies or organizations. <app>Empathy</app> allows "
-"you to connect to an existing account for most popular services. To create a "
-"new account with one of these services, you will need to visit the service’s "
-"web site and agree to its terms of use."
+"You can browse your conversations by date. Days on which you had a "
+"conversation with the selected contact will be shown in bold text. Click a "
+"date to select it. Click the arrows next to the month and year to browse "
+"earlier dates."
 msgstr ""
-"Existen muchos servicios propietarios de mensajería instantánea "
-"desarrollados por diferentes empresas u organizaciones. <app>Empathy</app> "
-"le permite conectarse a una cuenta existente de los servicios más populares. "
-"Para crear una cuenta nueva con uno de esos servicios deberá visitar el "
-"servicio web del sitio y aceptar los términos de uso."
-
-#: C/create-account.page:133(link) C/audio-video.page:135(p)
-msgid "AIM"
-msgstr "AIM"
-
-#: C/create-account.page:138(link) C/audio-video.page:160(p)
-msgid "ICQ"
-msgstr "ICQ"
-
-#: C/create-account.page:143(link) C/audio-video.page:175(p)
-msgid "MSN"
-msgstr "MSN"
-
-#: C/create-account.page:148(link) C/audio-video.page:210(p)
-msgid "Yahoo!"
-msgstr "Yahoo!"
-
-#: C/change-status.page:9(desc)
-msgid "Change your status to advertise your availability to your contacts."
-msgstr "Cambie su estado para avisar de su disponibilidad a sus contactos."
+"Puede examinar sus conversaciones por fecha. Los días en los que mantuvo una "
+"conversación con el contacto seleccionado se mostrarán en negrita. Pulse "
+"sobre una fecha para seleccionarla. Pulse las fechas junto al mes y año para "
+"examinar fechas anteriores."
 
-#: C/change-status.page:39(title)
-msgid "Change your status"
-msgstr "Cambiar su estado"
+#: C/prev-conv.page:105(section/p)
+msgid ""
+"You can search for text in the conversations by typing into the search field "
+"at the top. The matching conversations will be showed."
+msgstr ""
+"Puede buscar texto en las conversaciones mostradas escribiéndolo en el campo "
+"de búsqueda en la parte superior. Se resaltarán las conversaciones "
+"coincidentes."
 
-#: C/change-status.page:41(p)
+#: C/prev-conv.page:111(note/p)
 msgid ""
-"You can set your status to indicate your availability to your contacts. "
-"<app>Empathy</app> allows you to select from a list of defined statuses."
+"You can quickly view the previous conversations with one of your contacts "
+"from the <gui>Contact List</gui> window. Simply right click the contact and "
+"choose <gui>Previous Conversations</gui>. The <gui>Previous Conversations</"
+"gui> window will open with that contact already selected."
 msgstr ""
-"Puede establecer su estado para indicar su disponibilidad a sus contactos. "
-"<app>Empathy</app> le permite seleccionar una lista de estados predefinidos."
+"Puede ver rápidamente las conversaciones anteriores con uno de sus contactos "
+"desde la ventana <gui>Lista de contactos</gui>. Simplemente pulse con el "
+"botón derecho del ratón sobre el contacto y seleccione <gui>Conversaciones "
+"anteriores</gui>. Se abrirá la ventana <gui>Conversaciones previas</gui> con "
+"el contacto seleccionado."
 
-#: C/change-status.page:46(p)
+#: C/prob-conn-acctdisabled.page:7(info/desc)
 msgid ""
-"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
+"The instant messaging account that you want to use is not enabled in the "
+"list of accounts."
 msgstr ""
-"Pulse en la lista desplegable en la parte superior de la ventana de la "
-"<gui>Lista de contactos</gui>."
+"La cuenta de mensajería instantánea que quiere usar no está activada en la "
+"lista de cuentas."
 
-#: C/change-status.page:51(p)
-msgid "Select a status from the list."
-msgstr "Seleccione un estado de la lista."
+#: C/prob-conn-acctdisabled.page:34(page/title)
+msgid "My account is not enabled"
+msgstr "Mi cuenta no está activada"
 
-#: C/change-status.page:57(p)
+#: C/prob-conn-acctdisabled.page:36(page/p)
 msgid ""
-"See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
-"what they mean. You can also <link xref=\"set-custom-status\">add custom "
-"status messages</link> to provide more information about your availability "
-"to your contacts."
+"If the instant messaging account that you want to use is not enabled in the "
+"drop-down account list when you try to start a new conversation or join a "
+"room, your account details may not be correct."
 msgstr ""
-"Consulte la <link xref=\"status-icons\"/> para obtener una lista de los "
-"estados predefinidos y lo que significan. También puede <link xref=\"set-"
-"custom-status\">añadir mensajes de estado personalizados</link> para "
-"proporcionar a sus contactos más información acerca de su disponibilidad."
+"Si la cuenta de mensajería instantánea que quiere usar no está activada en "
+"la lista desplegable de cuentas, cuando intenta iniciar una conversación "
+"nueva o unirse a una charla, puede que los detalles de su cuenta no sean "
+"correctos."
 
-#: C/change-status.page:63(p)
+#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:45(item/p)
+#: C/prob-conn-neterror.page:53(item/p)
 msgid ""
-"If you do not use your computer for a while, or if the screensaver is on, "
-"the status will be automatically set to Away."
+"Make sure that you are connected to the Internet, or to a local area network."
+msgstr "Asegúrese de que está conectado a Internet o a una red de área local."
+
+#: C/prob-conn-acctdisabled.page:49(item/p)
+msgid ""
+"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
+"account that is not working."
 msgstr ""
-"Si no usa su equipo durante un rato, o si se activa el salvapantallas, el "
-"estado se cambiará automáticamente a Ausente."
+"Elija <guiseq><gui>Editar</gui><gui>Cuentas</gui></guiseq> y seleccione la "
+"cuenta que no está funcionando."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/audio-video.page:58(None)
+#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p)
 msgid ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
+"Type your username and password again to make sure that they are correct."
 msgstr ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
+"Escriba su nombre de usuario y contraseña de nuevo y asegúrese de que son "
+"correctos."
 
-#: C/audio-video.page:8(desc)
+#: C/prob-conn-acctdisabled.page:60(item/p)
+#: C/prob-conn-neterror.page:64(item/p)
 msgid ""
-"Information on when it is possible to have an audio or video conversation."
+"Check in the <gui>Advanced</gui> section that all the details are correct. "
+"You should be able to find these details from the website of the messaging "
+"service."
 msgstr ""
-"Información acerca de cuándo es posible tener una conversación de vídeo o "
-"sonido."
+"Expanda la sección <gui>Avanzadas</gui> y asegúrese de que los detalles son "
+"correctos. Debería poder encontrar estos detalles en la página web del "
+"servicio de mensajería."
 
-#: C/audio-video.page:32(title)
-msgid "Audio and video support"
-msgstr "Soporte de sonido y vídeo"
+#: C/prob-conn-acctdisabled.page:66(item/p)
+msgid "Check that the account is switched on."
+msgstr "Compruebe que la cuenta está activada"
 
-#: C/audio-video.page:34(p)
+#: C/prob-conn-auth.page:8(info/desc)
 msgid ""
-"You can only have audio and video conversation with contacts who are using "
-"an application which also supports this feature. When your contacts support "
-"audio or video conversations, you will see the following icons next to their "
-"names in the contact list:"
+"An error message which says “<gui>Authentication failed</gui>� appears in "
+"the main window."
 msgstr ""
-"Sólo puede tener conversaciones de sonido y vídeo con contactos que estén "
-"usando una aplicación que también soporte la característica. Cuando las "
-"aplicaciones de sus contactos soportan conversaciones de sonido o vídeo lo "
-"verá en forma de iconos junto a sus nombres, en la lista de contactos:"
+"Aparece un mensaje de error en la ventana principal que muestra «<gui>Falló "
+"la autenticación</gui>»."
 
-#: C/audio-video.page:43(p)
-msgid "Icon"
-msgstr "Icono"
+#: C/prob-conn-auth.page:36(page/title)
+msgid "I get a message that says “Authentication failed�"
+msgstr "Obtengo un mensaje que dice «Falló la autenticación»"
 
-#: C/audio-video.page:48(p)
-msgid "Description"
-msgstr "Descripción"
+#: C/prob-conn-auth.page:38(page/p)
+msgid ""
+"This kind of error happens when your instant messaging service is not "
+"allowing you to connect because it does not recognize your username or "
+"password for some reason."
+msgstr ""
+"Este tipo de error sucede cuando su servicio de mensajería instantánea no le "
+"está permitiendo conectar porque por alguna razón no reconoce su nombre de "
+"usuario o contraseña."
 
-#: C/audio-video.page:58(media)
-msgid "Icon for audio conversation"
-msgstr "Icono para la conversación de sonido"
+#: C/prob-conn-auth.page:50(item/p)
+msgid ""
+"Make sure that you have registered an account with the service you are "
+"trying to connect to. If you do not have an account, most services will not "
+"allow you to connect."
+msgstr ""
+"Asegúrese de que ha registrado una cuenta con el servicio al que está "
+"intentando conectarse. Si no tiene una cuenta la mayoría de los servicios no "
+"le permitirán que se conecte."
 
-#: C/audio-video.page:64(p)
-msgid "The contact is able to have an audio conversation."
-msgstr "El contacto puede tener conversaciones de sonido."
+#: C/prob-conn-auth.page:57(item/p) C/prob-conn-name.page:43(item/p)
+#: C/prob-conn-neterror.page:58(item/p)
+msgid ""
+"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
+"\">edit</media> icon in the error message."
+msgstr ""
+"Pulse el icono <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-"
+"edit.png\">Editar</media> en el mensaje de error."
 
-#: C/audio-video.page:70(media)
-msgid "Icon for video conversation"
-msgstr "Icono para la conversación de vídeo"
+#: C/prob-conn-auth.page:68(item/p)
+msgid ""
+"Deselect the <gui>Enabled</gui>, and then select it again to try to "
+"reconnect to the service."
+msgstr ""
+"Deseleccione la casilla de verificación <gui>Activada</gui> y después "
+"selecciónela de nuevo para intentar reconectar con el servicio."
 
-#: C/audio-video.page:76(p)
-msgid "The contact is able to have a video conversation."
-msgstr "El contacto puede tener conversaciones de vídeo."
+#: C/prob-conn-name.page:9(info/title)
+#| msgid "“Name in use�"
+msgctxt "link:error-msg"
+msgid "“Name in use�"
+msgstr "«Nombre en uso»"
 
-#: C/audio-video.page:83(p)
+#: C/prob-conn-name.page:10(info/desc)
 msgid ""
-"In order to have an audio conversation, you need to have a sound card that "
-"is supported by your operating system, and a working microphone."
+"An error message which says “<gui>Name in use</gui>� appears in the main "
+"window."
 msgstr ""
-"Para poder tener una conversación de sonido debe tener una tarjeta de sonido "
-"soportada por el sistema operativo y un micrófono que funcione."
+"Aparecen en la ventana principal un mensaje de error que dice «<gui>Nombre en "
+"uso</gui>»."
+
+#: C/prob-conn-name.page:33(page/title)
+msgid "I get a message that says “Name in use�"
+msgstr "Obtengo un mensaje de error que muestra «Nombre en uso»"
 
-#: C/audio-video.page:87(p)
+#: C/prob-conn-name.page:35(page/p)
 msgid ""
-"In order to have a video conversation, you need to have a webcam that is "
-"supported by your operating system, and a working microphone."
+"This kind of error happens when you try to connect to your IRC account and "
+"you are using a nickname that is already being used by someone else on that "
+"particular network."
 msgstr ""
-"Para poder tener una conversación de vídeo debe tener una cámara web "
-"soportada por el sistema operativo y un micrófono que funcione."
+"Este tipo de error sucede cuando intenta conectarse a su cuenta de IRC y "
+"está usando un apodo que ya está usando otra persona en esa red en "
+"particular."
 
-#: C/audio-video.page:95(title)
-msgid "Supported Account Types"
-msgstr "Tipos de cuentas soportadas"
+#: C/prob-conn-name.page:51(item/p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "En la caja de texto <gui>Apodo</gui> escriba un apodo nuevo."
 
-#: C/audio-video.page:97(p)
+#: C/prob-conn-name.page:56(item/p)
 msgid ""
-"You can only have audio and video conversations using accounts on certain "
-"supported services. The following table lists whether audio and video is "
-"supported for each type of account."
+"If you have registered that nickname within the network you are using, set "
+"the password for that nickname. For more information, see <link xref=\"irc-"
+"nick-password\"/>."
 msgstr ""
-"Sólo puede tener conversaciones de sonido y vídeo usando cuentas en ciertos "
-"servicios soportados. La siguiente tabla lista si el sonido y vídeo está "
-"soportado para cada tipo de cuenta."
+"Si ha registrado ese apodo en la red que está usando, establezca la "
+"contraseña para ese apodo. Para obtener más información consulte la <link "
+"xref=\"irc-nick-password\"/>."
 
-#: C/audio-video.page:102(p)
+#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p)
 msgid ""
-"Account types are provided by plugins. Your system may not have all of the "
-"following types available, or it may have types not listed here. Updated "
-"plugins may make audio or video conversations possible on account types that "
-"are listed as unsupported here."
+"Switch the account off, and then switch it on to try to reconnect to the "
+"service."
 msgstr ""
-"Los complementos proporcionan los tipos de cuentas. Puede que su sistema no "
-"tenga disponible todos los siguientes tipos, o puede tener tipos no listados "
-"aquí. Las actualizaciones de complementos pueden hacer posibles "
-"conversaciones de sonido o vídeo en tipos de cuentas que aquí se muestran "
-"como no soportadas."
+"Salga de la cuenta y vuelva a entrar para volver a conectarse al servicio."
 
-#: C/audio-video.page:110(p)
+#: C/prob-conn-neterror.page:7(info/desc)
 msgid ""
-"I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
-"need to look at the accessibility impact. I've <link href=\"http://mail."
-"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
-"accessibility team</link> for input."
+"An error message which says “<gui>Network error</gui>� appears in the main "
+"window."
 msgstr ""
-"Me gustaría poner tablas como ésta sin usar nada para No y ✔ para Sí, pero "
-"se debe tener en cuenta el impacto en la accesibilidad. Ya <link href="
-"\"http://mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006.html"
-"\">he preguntado al equipo de accesibilidad</link>."
+"Aparecerá el mensaje de error «<gui>Error de red</gui>» en la ventana "
+"principal."
+
+#: C/prob-conn-neterror.page:34(page/title)
+msgid "I get a message that says “Network error�"
+msgstr "Obtengo un mensaje que muestra «Error de red»"
 
-#: C/audio-video.page:118(p)
+#: C/prob-conn-neterror.page:42(page/p)
 msgid ""
-"There's recent work on telepathy-butterfly and papyon to support audio and "
-"video for MSN. It might be released in time for 2.28, but since it doesn't "
-"follow the Gnome release schedule, I can't be sure. If it looks like it's "
-"going to ship, let's mark it Yes."
+"This kind of error happens when <app>Empathy</app> cannot communicate with "
+"the instant messaging service for some reason."
 msgstr ""
-"Existe trabajo reciente en telepathy-butterfly y papyon para soportar sonido "
-"y vídeo para MSN. Puede que se publique a tiempo para 2.28 pero ya que no "
-"sigue la planificación de publicaciones de GNOME no se puede estar seguro. "
-"Si parece que va a dar tiempo se incluirá."
-
-#: C/audio-video.page:128(p)
-msgid "Service"
-msgstr "Servicio"
+"Este tipo de mensaje sucede cuando <app>Empathy</app> no se puede comunicar "
+"con el servicio de mensajería instantánea por alguna razón."
 
-#: C/audio-video.page:129(p)
-msgid "Audio"
-msgstr "Sonido"
+#: C/prob-conn-neterror.page:46(page/p)
+msgid ""
+"Also, this kind of error happens when you try to use an IRC account without "
+"setting a nickname."
+msgstr ""
+"Este tipo de error también sucede cuando intenta usar una cuenta de IRC sin "
+"haber configurado el apodo."
 
-#: C/audio-video.page:130(p)
-msgid "Video"
-msgstr "Vídeo"
+#: C/prob-conn-neterror.page:87(section/title)
+msgid "Proxy support"
+msgstr "Soporte de proxy"
 
-#: C/audio-video.page:136(p) C/audio-video.page:137(p)
-#: C/audio-video.page:141(p) C/audio-video.page:142(p)
-#: C/audio-video.page:146(p) C/audio-video.page:147(p)
-#: C/audio-video.page:156(p) C/audio-video.page:157(p)
-#: C/audio-video.page:161(p) C/audio-video.page:162(p)
-#: C/audio-video.page:166(p) C/audio-video.page:167(p)
-#: C/audio-video.page:181(p) C/audio-video.page:182(p)
-#: C/audio-video.page:186(p) C/audio-video.page:187(p)
-#: C/audio-video.page:191(p) C/audio-video.page:192(p)
-#: C/audio-video.page:196(p) C/audio-video.page:197(p)
-#: C/audio-video.page:201(p) C/audio-video.page:202(p)
-#: C/audio-video.page:211(p) C/audio-video.page:212(p)
-#: C/audio-video.page:216(p) C/audio-video.page:217(p)
-msgid "No"
-msgstr "No"
+#: C/prob-conn-neterror.page:88(section/p)
+msgid ""
+"At the moment <app>Empathy</app> can not be configured to work with a proxy."
+msgstr ""
+"Por el momento <app>Empathy</app> no se puede configurar para que funcione "
+"con un proxy."
 
-#: C/audio-video.page:140(p)
-msgid "Facebook Chat"
-msgstr "Chat de Facebook"
+#: C/prob-conn.page:7(info/desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr ""
+"Diagnosticar problemas comunes al conectarse a un servicio de mensajería "
+"instantánea."
 
-#: C/audio-video.page:145(p)
-msgid "gadugadu"
-msgstr "gadugadu"
+#: C/prob-conn.page:29(page/title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Problemas al conectarse a un servicio de mensajería instantánea"
 
-#: C/audio-video.page:150(p)
-msgid "Google Talk"
-msgstr "Google Talk"
+#: C/remove-account.page:8(info/desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "Quitar completamente una cuenta en <app>Empathy</app>."
 
-#: C/audio-video.page:151(p) C/audio-video.page:152(p)
-#: C/audio-video.page:171(p) C/audio-video.page:172(p)
-#: C/audio-video.page:176(p) C/audio-video.page:177(p)
-#: C/audio-video.page:206(p) C/audio-video.page:207(p)
-msgid "Yes"
-msgstr "Sí"
+#: C/remove-account.page:34(page/title)
+msgid "Remove an account"
+msgstr "Quitar una cuenta"
 
-#: C/audio-video.page:155(p)
-msgid "Groupwise"
-msgstr "Groupwise"
+#: C/remove-account.page:36(page/p)
+msgid ""
+"You can completely remove an account from <app>Empathy</app> if you no "
+"longer wish to use the account. If you wish to use the account in "
+"<app>Empathy</app> again in the future, you will have to add your account "
+"details again."
+msgstr ""
+"Puede quitar completamente una cuenta de <app>Empathy</app> si no quiere "
+"seguir usándola. Si quiere usar de nuevo la cuenta en <app>Empathy</app> en "
+"el futuro, deberá añadir los detalles de la cuenta de nuevo."
 
-#: C/audio-video.page:180(p)
-msgid "myspace"
-msgstr "myspace"
+#: C/remove-account.page:47(item/p)
+msgid ""
+"Select the account you wish to remove from the accounts list on the left "
+"side of the window."
+msgstr ""
+"Seleccione la cuenta que quiere quitar de la lista de cuentas en la parte "
+"izquierda de la ventana."
 
-#: C/audio-video.page:185(p)
-msgid "qq"
-msgstr "qq"
+#: C/remove-account.page:51(item/p)
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "Pulse <gui style=\"button\">-</gui>."
 
-#: C/audio-video.page:195(p)
-msgid "sametime"
-msgstr "sametime"
+#: C/remove-account.page:54(item/p)
+msgid ""
+"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
+"button to permanently remove the account."
+msgstr ""
+"Se mostrará un diálogo preguntando por una confirmación. Pulse el botón "
+"<gui>Quitar</gui> para quitar la cuenta permanentemente."
 
-#: C/audio-video.page:200(p)
-msgid "silc"
-msgstr "silc"
+#: C/remove-account.page:60(note/p)
+msgid ""
+"Even after removing an account, <app>Empathy</app> does not delete your "
+"conversation history for that account."
+msgstr ""
+"Incluso después de quitar una cuenta, <app>Empathy</app> no borra su "
+"histórico de conversaciones para esa cuenta."
 
-#: C/audio-video.page:215(p)
-msgid "zephyr"
-msgstr "zephyr"
+#: C/salut-protocol.page:8(info/desc)
+msgid "Understanding the People Nearby feature."
+msgstr "Entender la característica Gente cerca."
 
-#: C/audio-call.page:9(desc)
-msgid "Call your contacts over the Internet."
-msgstr "Llamar a sus contactos a través de Internet."
+#: C/salut-protocol.page:33(page/title)
+msgid "What is People Nearby?"
+msgstr "¿Qué es Gente cerca?"
 
-#: C/audio-call.page:27(title)
-msgid "Start an audio conversation"
-msgstr "Iniciar una conversación de sonido"
+#: C/salut-protocol.page:40(page/p)
+msgid ""
+"The People Nearby service is a serverless communication service: you do not "
+"need to connect and authenticate to a central server in order to use it."
+msgstr ""
+"El servicio Gente cerca es un servicio de comunicación sin servidores: no "
+"necesita conectarse y autenticarse contra un servidor central para poder "
+"usarlo."
 
-#: C/audio-call.page:29(p)
+#: C/salut-protocol.page:45(page/p)
 msgid ""
-"You can call your contacts and have an audio conversation with them. This "
-"features only works with certain types of accounts, and it requires the "
-"other person to have an application that supports audio calls."
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
 msgstr ""
-"Puede llamar a sus contactos y tener conversaciones de sonido con ellos. "
-"Esta característica sólo funciona con cierto tipo de cuentas y requiere que "
-"la otra persona tenga una aplicación que soporte llamadas de sonido."
+"Este tipo de sistemas de mensajería sin servidores está restringido a redes "
+"de área local y no se necesita una conexión activa con Internet."
 
-#: C/audio-call.page:34(p)
+#: C/salut-protocol.page:49(page/p)
 msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
-"next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Audio Call</gui>."
+"The people that use this service inside the same local area network will be "
+"auto-discovered, and it will be possible to send them messages and files as "
+"with other services."
 msgstr ""
-"Desde la ventana <gui>Lista de contactos</gui> pulse el icono de <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">videollamada</"
-"media> junto al nombre del contacto al que desea llamar y seleccione <gui "
-"style=\"menuitem\">Llamada de voz</gui>."
+"La gente que usa este servicio dentro de la misma red de área local se "
+"autodescubrirá y será posible enviarles mensajes y archivos al igual que con "
+"otros servicios."
 
-#: C/audio-call.page:55(p)
+#: C/salut-protocol.page:54(page/p)
 msgid ""
-"To turn an audio conversation into a video conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
+"All the modern local area networks should be able to support this kind of "
+"service."
 msgstr ""
-"Para convertir una conversación de sonido en una de vídeo, elija "
-"<guiseq><gui style=\"menu\">Vídeo</gui><gui style=\"menuitem\">Vídeo "
-"encendido</gui></guiseq>."
+"Todas las redes modernas de área local deberían poder soportar este tipo de "
+"servicio."
 
-#: C/audio-call.page:63(title)
-msgid "Start an audio conversation with a meta-contact"
-msgstr "Iniciar una conversación con un metacontacto"
+#: C/send-file.page:8(info/desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Enviar un archivo desde su equipo a uno de sus contactos."
 
-#: C/audio-call.page:71(p)
+#: C/send-file.page:36(page/title)
+msgid "Send files"
+msgstr "Enviar archivos"
+
+#: C/send-file.page:45(item/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Audio Call</gui>."
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
 msgstr ""
-"Seleccione el contacto con el que quiere tener la conversación y, del menú, "
-"seleccione <gui style=\"menuitem\">Llamada de voz</gui>."
+"Pulse con el botón derecho sobre el contacto al que quiere enviar un archivo "
+"y seleccione <gui>Enviar archivo</gui>."
 
-#: C/add-contact.page:9(desc)
-msgid "Add someone to the contact list."
-msgstr "Añadir alguien a la lista de contactos."
+#: C/send-file.page:50(item/p)
+#| msgid ""
+#| "Click on the contact you want to send a file, and choose "
+#| "<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
+msgid ""
+"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
+"gui> <gui>Contact</gui><gui>Send file</gui></guiseq>."
+msgstr ""
+"Pulse sobre el contacto al que quiere enviar un archivo y elija "
+"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Enviar archivo</gui></"
+"guiseq>."
 
-#: C/add-contact.page:33(title)
-msgid "Add someone to your list of contacts"
-msgstr "Añadir alguien a su lista de contactos"
+#: C/send-file.page:58(item/p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "Seleccione el archivo para enviar y pulse <gui>Enviar</gui>."
 
-#: C/add-contact.page:37(p)
-msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
-msgstr "Elija <guiseq><gui>Chat</gui><gui>Añadir contacto</gui></guiseq>."
+#: C/send-file.page:63(item/p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "Aparecerá la ventana <gui>Transferencias de archivos</gui>."
 
-#: C/add-contact.page:40(p)
+#: C/send-file.page:66(item/p)
 msgid ""
-"From the <gui>Account</gui> drop-down list, select the account you wish to "
-"use to connect to your contact. Your contact will need to be using the same "
-"service as the account you select."
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
+"to halt the transfer."
 msgstr ""
-"Desde la lista desplegable <gui>Cuenta</gui> seleccione la cuenta que quiere "
-"usar para conectar con su contacto. Su contacto deberá usar el mismo "
-"servicio que la cuenta que esté seleccionando."
+"Espere a que su contacto acepte la transferencia de archivo o pulse "
+"<gui>Detener</gui> para detener la transferencia."
 
-#: C/add-contact.page:45(p)
+#: C/send-file.page:72(item/p)
 msgid ""
-"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
-"screen name, or other appropriate identifier for the service type."
+"Once the transfer is finished, it is possible to close the <gui>File "
+"Transfers</gui> window."
 msgstr ""
-"En el campo <gui>Identificador</gui> introduzca el ID de inicio de sesión de "
-"su contacto, su nombre en pantalla u otro identificador apropiado para el "
-"tipo de servicio."
+"Una vez que la transferencia haya finalizado, es posible cerrar la ventana "
+"<gui>Transferencias de archivos</gui>."
 
-#: C/add-contact.page:49(p)
+#: C/send-file.page:80(note/p)
 msgid ""
-"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
-"to appear in your contact list."
+"If you have multiple finished transfers listed in the window, click on "
+"<gui>Clear</gui> to empty the list. This will only remove the files from the "
+"list and will not delete them from your computer."
 msgstr ""
-"En el campo <gui>Apodo</gui> escriba el nombre de su contacto tal y como le "
-"gustaría que apareciese en su lista de contactos."
+"Si tiene múltiples transferencias finalizadas listas en la ventana pulse "
+"<gui>Limpiar</gui> para vaciar la lista. Esto sólo quitará los archivos de "
+"la lista y no los borrará de su equipo."
 
-#: C/add-contact.page:53(p)
-msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+#: C/send-file.page:87(note/p)
+msgid ""
+"It is possible to send files only using the following services: <em>Jabber</"
+"em>, <em>Google Talk</em> and <em>People Nearby</em>."
 msgstr ""
-"Pulse <gui>Añadir</gui> para añadir la persona a su lista de contactos."
+"Sólo es posible enviar archivos usando los siguientes servicios: <em>Jabber</"
+"em>, <em>Google Talk</em> y <em>Gente cerca</em>."
 
-#: C/add-contact.page:61(p)
+#: C/send-file.page:93(note/p)
 msgid ""
-"To add a new person to your list of contacts, you need to be connected to "
-"the Internet and to your account."
+"In order to send a file to someone, you need to be connected to the "
+"Internet, or to a local area network."
 msgstr ""
-"Para añadir una persona nueva a su lista de contactos necesita estar "
-"conectado a Internet y a su cuenta."
+"Para poder enviar un archivo a alguien necesita estar conectado a Internet o "
+"a una red de área local."
 
-#: C/add-account.page:9(desc)
-msgid "Add a new account to <app>Empathy</app>."
-msgstr "Añadir una cuenta nueva en <app>Empathy</app>."
+#: C/send-message.page:8(info/desc)
+msgid "Send a message to one of your contacts."
+msgstr "Enviar un mensaje a uno de sus contactos."
 
-#: C/add-account.page:40(title)
-msgid "Add a new account"
-msgstr "Añadir una cuenta nueva"
+#: C/send-message.page:32(page/title)
+msgid "Send a message to someone"
+msgstr "Enviar un mensaje a alguien"
 
-#: C/add-account.page:42(p)
+#: C/send-message.page:36(item/p)
 msgid ""
-"You can add instant messaging accounts from any supported service to "
-"communicate with all of your contacts in <app>Empathy</app>. For some "
-"account providers, these steps will also allow you to register for a new "
-"account. For more details, see <link xref=\"create-account\"/>."
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
 msgstr ""
-"Puede añadir cuentas de mensajería instantánea de cualquier servicio "
-"soportado para comunicarse con todos sus contactos desde <app>Empathy</app>. "
-"Para algunos proveedores de cuentas estos pasos le permitirán registrar una "
-"cuenta nueva. Para obtener más detalles consulte la <link xref=\"create-"
-"account\"/>."
-
-#: C/add-account.page:53(p)
-#| msgid "Click <gui style=\"button\">Add</gui>."
-msgid "Click <gui style=\"button\">+</gui>."
-msgstr "Pulse <gui style=\"button\">+</gui>."
+"Desde la ventana <gui>Lista de contactos</gui> pulse dos veces sobre el "
+"nombre del contacto con el que quiere tener una conversación."
 
-#: C/add-account.page:58(p)
+#: C/send-message.page:42(item/p)
 msgid ""
-"From the <gui>Protocol</gui> drop-down list, select the type of account you "
-"wish to add."
+"A new window will open. Type a message into the box at the bottom of the "
+"window and press <key>Enter</key> to send it."
 msgstr ""
-"Desde la lista desplegable <gui>Protocolo</gui> seleccione el tipo de cuenta "
-"que quiere añadir."
+"Se abrirá una ventana nueva. Cuando se establezca la conexión, verá la "
+"ventana de charla en la parte inferior de la ventana, <key>Intro</key> y el "
+"tiempo total de conversación."
 
-#: C/add-account.page:62(p)
-msgid ""
-"If you do not already have a registered account, select <gui>Create a new "
-"account on the server</gui>. This feature is not available for all account "
-"types, and may not work with some account providers. See <link xref=\"create-"
-"account\"/> for more information."
-msgstr ""
-"Si aún no tiene una cuenta registrada seleccione <gui>Crear una cuenta nueva "
-"en el servidor</gui>. Esta característica no está disponible para todos los "
-"tipos de cuentas y puede no funcionar con algunos proveedores de cuentas. "
-"Para obtener más información consulte la <link xref=\"create-account\"/>."
+#: C/send-message.page:50(section/title)
+msgid "Send a message to a meta-contact"
+msgstr "Enviar un mensaje a un metacontacto"
 
-#: C/add-account.page:69(p)
-#| msgid ""
-#| "Enter the required information. For most accounts, you will only need a "
-#| "login ID and a password. Some accounts may require additional "
-#| "information. See <link xref=\"accounts-window#details\"/> for more "
-#| "information."
+#: C/send-message.page:58(item/p)
 msgid ""
-"Enter the required information. For most accounts, you will only need a "
-"login ID and a password. Some accounts may require additional information. "
-"See <link xref=\"accounts-window#details\"/>for more information."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
 msgstr ""
-"Introduzca la información requerida. Para la mayoría de cuentas sólo "
-"necesitará un ID de inicio de sesión y una contraseña. Algunas cuentas "
-"pueden requerir información adicional. Para obtener más información consulte "
-"la <link xref=\"accounts-window#details\"/>."
+"Seleccione el contacto con el que quiere tener la conversación y, del menú, "
+"seleccione <gui style=\"menuitem\">Chat</gui>."
 
-#: C/add-account.page:81(p)
-msgid ""
-"To change the name that identifies the account in the <gui>Accounts</gui> "
-"window, select the account from the list on the left and either click on the "
-"name or press the space bar. Edit the account name and press <key>Enter</"
-"key> when you’re finished."
-msgstr ""
-"Para cambiar el nombre que identifica la cuenta en la ventana <gui>Cuentas</"
-"gui>, seleccione la cuenta de la lista a la izquierda y pulse en el nombre o "
-"la barra espaciadora. Edite el nombre de la cuenta y pulse <key>Intro</key> "
-"cuando haya acabado."
+#: C/set-custom-status.page:9(info/desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "Añadir, editar o borrar un mensaje personal para su estado."
 
-#: C/accounts-window.page:11(desc)
-msgid "Add, modify, and delete accounts."
-msgstr "Añadir, modificar y borrar cuentas."
+#: C/set-custom-status.page:15(credit/name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
 
-#: C/accounts-window.page:33(title)
-msgid "Accounts Window"
-msgstr "Ventana de cuentas"
+#: C/set-custom-status.page:34(page/title)
+msgid "Set a custom message"
+msgstr "Establecer un mensaje personalizado"
 
-#: C/accounts-window.page:35(p)
+#: C/set-custom-status.page:36(page/p)
 msgid ""
-"The <gui>Accounts</gui> window allows you to add, modify, and delete "
-"accounts."
+"Sometimes you may want to set a custom message for your status, for example "
+"to let people know that you will be unavailable for a certain period of time."
 msgstr ""
-"La ventana <gui>Cuentas</gui> le permite añadir, modificar y eliminar "
-"cuentas."
-
-#: C/accounts-window.page:43(title)
-msgid "Account Details"
-msgstr "Detalles de la cuenta"
+"A veces puede querer usar un mensaje personal para su estado, por ejemplo, "
+"para hacer saber a sus contactos que no estará disponible por un periodo de "
+"tiempo."
 
-#: C/accounts-window.page:44(p)
+#: C/set-custom-status.page:40(page/p)
 msgid ""
-"For most types of accounts, you can simply enter a login ID and a password. "
-"Certain accounts or account types, however, may require additional "
-"information."
+"It is possible to set a custom message based on the different statuses "
+"available."
 msgstr ""
-"Para la mayoría de los tipos de cuenta puede, simplemente, introducir un ID "
-"de inicio de sesión y una contraseña. No obstante, algunos tipos de cuenta "
-"pueden requerir información adicional."
-
-#: C/account-jabber.page:7(desc)
-msgid "Advanced options for Jabber and Google Talk accounts."
-msgstr "Opciones avanzadas para cuentas Jabber y Google Talk."
-
-#: C/account-jabber.page:29(title)
-msgid "Jabber account details"
-msgstr "Detalles de la cuenta Jabber"
+"Es posible establecer un mensaje personalizado basado en los diferentes "
+"estados disponibles."
 
-#: C/account-jabber.page:31(p)
+#: C/set-custom-status.page:46(item/p) C/set-custom-status.page:82(item/p)
 msgid ""
-"Most Jabber accounts will require only a login ID and a password to connect. "
-"For some accounts or on certain types of networks, you may need to enter "
-"additional information in the <gui>Advanced</gui> section. Normally, you "
-"will not need to use the advanced options below. For general instructions on "
-"adding an account, see <link xref=\"add-account\"/>."
+"From the <gui>Contact List</gui> window, click on the drop-down list at the "
+"top."
 msgstr ""
-"La mayoría de cuentas Jabber, para conectarse, sólo requieren un ID de "
-"inicio de sesión y una contraseña. Para algunas cuentas en cierto tipo de "
-"redes, puede necesitar introducir información adicional en la sección "
-"<gui>Avanzadas</gui>. Generalmente no necesitará usar las opciones avanzadas "
-"de debajo. Consulte la <link xref=\"add-account\"/> para obtener "
-"instrucciones generales para añadir una cuenta."
+"Desde la ventana <gui>Lista de contactos</gui>, pulse en la lista "
+"desplegable en la parte superior."
 
-#: C/account-jabber.page:39(p)
+#: C/set-custom-status.page:52(item/p)
 msgid ""
-"Google Talk is a type of Jabber account. These instructions hold for Google "
-"Talk accounts as well."
+"Select the status you want to add a custom message to. You have to select "
+"the one identified with the label <gui>Custom Message</gui>."
 msgstr ""
-"Google Talk es un tipo de cuenta Jabber. Estas instrucciones también "
-"funcionan para cuentas de Google Talk."
-
-#: C/account-jabber.page:45(gui)
-msgid "Encryption required (TLS/SSL)"
-msgstr "Se requiere cifrado (TLS/SSL)"
+"Seleccione el estado al que quiere añadir el mensaje personalizado. Tiene "
+"que seleccionar el identificado con la etiqueta <gui>Mensaje personalizado</"
+"gui>."
 
-#: C/account-jabber.page:46(gui)
-msgid "Ignore SSL certificate errors"
-msgstr "Ignorar los errores de certificados SSL"
+#: C/set-custom-status.page:58(item/p)
+msgid ""
+"Enter your custom message in the text box at the top of the window, and "
+"press <key>Enter</key> to set the message."
+msgstr ""
+"Introduzca su mensaje personalizado en la caja de texto en la parte superior "
+"de la ventana y pulse <key>Intro</key> para establecer el mensaje."
 
-#: C/account-jabber.page:47(p)
+#: C/set-custom-status.page:64(item/p)
 msgid ""
-"Whenever possible, communication between <app>Empathy</app> and the Jabber "
-"server is encrypted. If encrypted communication is not possible, messages "
-"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
-"<app>Empathy</app> from communicating with the Jabber server when encryption "
-"is not possible."
+"If you want to set the custom message as a favorite, saving it in order to "
+"use it again, click on the little heart on the right of the text box where "
+"you wrote your custom message."
 msgstr ""
-"Siempre que sea posible, la comunicación entre <app>Empathy</app> y el "
-"servidor Jabber está cifrada. Si la comunicación cifrada no es posible, "
-"puede que los mensajes se envíen sin cifrar. Seleccione <gui>Requiere "
-"cifrado</gui> para evitar que <app>Empathy</app> se comunique con el "
-"servidor Jabber cuando no es posible cifrar la comunicación."
+"Si quiere establecer el mensaje personalizado como un favorito, guardándolo "
+"para usarlo de nuevo, pulse en el pequeño corazón a la derecha de la caja de "
+"texto donde escribió su mensaje personalizado."
 
-#: C/account-jabber.page:52(p)
+#: C/set-custom-status.page:69(item/p)
 msgid ""
-"Some Jabber servers may encrypt data using invalid certificates, or using "
-"certificates from unknown authorities. If you trust the server you are "
-"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
-"allow encrypted communication with invalid certificates."
+"If you do not do it, the custom message will not be available the next time "
+"you use <app>Empathy</app>. It will be saved only for the current session."
 msgstr ""
-"Algunos servidores Jabber pueden cifrar datos usando certificados no válidos "
-"o usando certificados de autoridades desconocidas. Si confía en el servidor "
-"al que se está conectando puede seleccionar <gui>Ignorar los errores de "
-"certificados SSL</gui> para permitir comunicaciones cifradas con "
-"certificados no válidos."
+"Si no lo hace el mensaje personalizado no estará disponible la próxima vez "
+"que use <app>Empathy</app>. Sólo se guardará durante la sesión actual."
 
-#: C/account-jabber.page:59(gui)
-msgid "Resource"
-msgstr "Recurso"
+#: C/set-custom-status.page:78(section/title)
+msgid "Edit and remove a custom message"
+msgstr "Editar y quitar un mensaje personalizado"
+
+#: C/set-custom-status.page:88(item/p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Seleccione <gui>Editar mensaje personalizado</gui>."
 
-#: C/account-jabber.page:60(gui)
-msgid "Priority"
-msgstr "Prioridad"
+#: C/set-custom-status.page:95(item/p)
+msgid "To edit a custom message:"
+msgstr "Para editar un mensaje personalizado:"
 
-#: C/account-jabber.page:61(p)
+#: C/set-custom-status.page:100(item/p)
 msgid ""
-"If you have multiple applications (for instance, on separate computers) "
-"connected to your account at the same time, you can set a resource to "
-"uniquely identify each one. By default, <app>Empathy</app> will use "
-"<input>Telepathy</input> as the resource."
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
 msgstr ""
-"Si tiene múltiples aplicaciones (en equipos diferentes, por ejemplo) "
-"conectados a su cuenta al mismo tiempo, puede configurar un recurso para "
-"identificar unívocamente cada una. De forma predeterminada <app>Empathy</"
-"app> usará <input>Telepathy</input> como recurso."
+"Desde la caja <gui>Estados guardados</gui>, seleccione el mensaje de estado "
+"que quiere editar y pulse dos veces sobre él."
 
-#: C/account-jabber.page:65(p)
-msgid ""
-"You can set the priority to specify which application should receive "
-"incoming messages from your contacts. New messages will be sent to the "
-"application with the highest priority."
+#: C/set-custom-status.page:106(item/p)
+msgid "Type the new custom message and press <key>Enter</key> to modify it."
 msgstr ""
-"Puede establecer la prioridad para especificar qué aplicación debería "
-"recibir mensajes entrantes de sus contactos. Los mensajes nuevos se enviarán "
-"a la aplicación con la prioridad más alta."
+"Escriba el mensaje personalizado nuevo y pulse <key>Intro</key> para "
+"modificarlo."
 
-#: C/account-jabber.page:70(gui)
-msgid "Override server settings"
-msgstr "Sobreescribir los ajustes del servidor"
+#: C/set-custom-status.page:113(item/p)
+msgid "To remove a custom message:"
+msgstr "Para quitar un mensaje personalizado:"
 
-#: C/account-jabber.page:71(p)
+#: C/set-custom-status.page:118(item/p)
 msgid ""
-"<app>Empathy</app> will use default settings to connect to the Jabber server "
-"based on your login ID. For some Jabber servers, you will need to enter "
-"custom server settings manually. These settings should be provided for you "
-"by your Jabber provider."
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"remove."
 msgstr ""
-"<app>Empathy</app> usará la configuración predeterminada para conectarse al "
-"servidor Jabber en función de su ID de inicio de sesión. Para algunos "
-"servidores Jabber necesitará introducir manualmente ajustes de servidor. Su "
-"proveedor Jabber deberá proporcionar esos ajustes."
+"Desde la caja <gui>Estados guardados</gui>, seleccione el mensaje de estado "
+"que quiere quitar."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:106(None)
-msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
-msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+#: C/set-custom-status.page:124(item/p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "Pulse el botón <gui>Quitar</gui>."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:112(None)
-msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+#: C/set-custom-status.page:133(item/p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "Cuando haya terminado pulse <gui>Cerrar</gui>."
+
+#: C/set-custom-status.page:140(note/p)
+msgid ""
+"When you edit a custom message, it will not be set as the current status "
+"message. You will need to select it from the <gui>Contact List</gui> window."
 msgstr ""
-"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+"Cuando edita un mensaje personalizado nuevo no se establece como el mensaje "
+"de estado actual. Deberá seleccionarlo en la ventana de <gui>Lista de "
+"contactos</gui>."
 
-#: C/account-irc.page:8(desc)
-msgid "Additional information necessary for connecting to IRC networks."
-msgstr "Información adicional necesaria para conectarse a redes IRC."
+#: C/share-desktop.page:7(info/desc)
+msgid "Show your desktop to your contacts."
+msgstr "Mostrar su escritorio a sus contactos."
 
-#: C/account-irc.page:31(title)
-msgid "IRC account details"
-msgstr "Detalles de la cuenta IRC"
+#: C/share-desktop.page:18(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/share-desktop.page:33(page/title)
+msgid "Share your desktop"
+msgstr "Compartir su escritorio"
 
-#: C/account-irc.page:33(p)
+#: C/share-desktop.page:35(page/p)
 msgid ""
-"IRC accounts require different information than many other types of "
-"accounts. To create an IRC account, you must specify at least an IRC network "
-"and a nickname. This page details the information you can provide for an IRC "
-"account."
+"It is possible to share your desktop with some of your contacts. You can use "
+"this functionality to show your desktop to your contacts to, for example, "
+"ask for help or help your contacts resolve a problem."
 msgstr ""
-"Las cuentas de IRC requieren información diferente que otros tipos de "
-"cuentas. Para crear una cuenta IRC debe especificar al menos la red IRC y el "
-"apodo. Esta página detalla la información que puede proporcionar para una "
-"cuenta de IRC."
-
-#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
-msgid "Network"
-msgstr "Red"
+"Es posible compartir su escritorio con algunos de sus contactos. Puede usar "
+"esta funcionalidad para mostrar su escritorio a sus contactos, o preguntar "
+"por ayuda o ayudar a sus contactos a resolver problemas."
 
-#: C/account-irc.page:46(p)
+#: C/share-desktop.page:42(note/p)
 msgid ""
-"IRC is an open system that allows people to run separate IRC networks. Each "
-"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
-"lists the most popular networks in the <gui>Network</gui> drop-down list. "
-"You can add additional networks. See <link xref=\"#networks\"/> below."
+"To be able to share your desktop, you need to have a VNC server, which has "
+"support for the feature, installed on your system. <app>Vino</app>, the "
+"GNOME VNC server, has the required support."
 msgstr ""
-"IRC es un sistema abierto que permite a la gente estar en diferentes redes "
-"IRC. Cada red es distinta y tiene sus propios usuarios y salas de chat. "
-"<app>Empathy</app> lista las redes más populares en la lista desplegable "
-"<gui>Red</gui>. Puede añadir redes adicionales. Consulte debajo la <link "
-"xref=\"#networks\"/>."
+"Para poder compartir su escritorio necesita tener un servidor VNC, que "
+"soporte para la característica, instalado en su sistema. <app>Vino</app>, el "
+"servidor VNC de GNOME, tiene el soporte necesario."
 
-#: C/account-irc.page:53(gui)
-msgid "Nickname"
-msgstr "Apodo"
+#: C/share-desktop.page:51(item/p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
+msgstr ""
+"En la ventana de la <gui>Lista de contactos</gui> realice una de las "
+"siguientes:"
 
-#: C/account-irc.page:54(p)
+#: C/share-desktop.page:56(item/p)
+#| msgid ""
+#| "Select the contact you want to share your desktop with and choose "
+#| "<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></"
+#| "guiseq>."
 msgid ""
-"Your nickname is your unique name on the IRC network. Only one person on a "
-"network may use a given nickname. If you get an error message that says "
-"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change "
-"your nickname."
+"Select the contact you want to share your desktop with and choose "
+"<guiseq><gui>Edit</gui><gui>Contact</gui> <gui>Share My Desktop</gui></"
+"guiseq>."
 msgstr ""
-"Su apodo es su nombre único en la red IRC. Sólo una persona en una red puede "
-"usar cierto apodo. Si obtiene un mensaje que dice <link xref=\"prob-conn-name"
-"\" role=\"error-msg\"/> deberá cambiar su apodo."
+"Seleccione el contacto con el que quiere compartir su escritorio y elija "
+"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Compartir mi escritorio</"
+"gui></guiseq>."
 
-#: C/account-irc.page:60(gui)
-msgid "Password"
-msgstr "Contraseña"
+#: C/share-desktop.page:63(item/p)
+msgid ""
+"Right-click on the name of the contact you want to share your desktop with "
+"and select <gui>Share My Desktop</gui>."
+msgstr ""
+"Pulse con el botón derecho del ratón sobre el nombre del contacto con el que "
+"quiera compartir su escritorio y seleccione <gui>Compartir mi escritorio</"
+"gui>."
 
-#: C/account-irc.page:61(p)
+#: C/share-desktop.page:71(item/p)
 msgid ""
-"Some servers, particularly those on private networks, require a password to "
-"connect. If you are authorized to use the network, the network "
-"administrators should provide you with a password."
+"An invitation to view your desktop will be sent to the contact you have "
+"selected. To view your desktop, they will need to accept it."
 msgstr ""
-"Algunos servidores, particularmente aquellos en redes privadas, requieren "
-"una contraseña para la conexión. Si está autorizado a usar la red, los "
-"administradores de la red le proporcionarán una contraseña."
+"Se enviará una invitación para ver su escritorio al contacto que haya "
+"seleccionado. Deberán aceptarla para poder ver su escritorio."
 
-#: C/account-irc.page:65(title)
-msgid "NickServ Passwords"
-msgstr "Contraseñas NickServ"
+#: C/share-desktop.page:77(item/p)
+msgid ""
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
+msgstr ""
+"Puede desconectar el contacto de su equipo usando su aplicación de "
+"compartición de escritorio."
 
-#: C/account-irc.page:66(p)
+#: C/share-desktop.page:82(note/p)
 msgid ""
-"On some networks, nicknames can be registered using a service known as "
-"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
-"On some networks, including the popular freenode network, server passwords "
-"are automatically forwarded to NickServ, allowing you to set this field to "
-"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
-"more details."
+"For more information about how to use the remote desktop sharing "
+"application, refer to its help."
 msgstr ""
-"En algunas redes los apodos se pueden registrar con un servicio conocido "
-"como NickServ. <app>Empathy</app> no soporta directamente contraseñas para "
-"apodos. En algunas redes, incluyendo la popular red freenode, las "
-"contraseñas de servidor se redireccionan automáticamente a NickServ, "
-"permitiéndole usar este campo para identificarse con NickServ. Para obtener "
-"más información consulte la <link xref=\"irc-nick-password\"/>."
+"Consulte la ayuda para obtener más información acerca de cómo usar la "
+"aplicación de compartición de escritorio."
 
-#: C/account-irc.page:76(gui)
-msgid "Real name"
-msgstr "Nombre real"
+#: C/share-desktop.page:90(page/p)
+msgid ""
+"When you share your desktop with someone else, it is possible to experience "
+"system performance slowdown and low Internet speed."
+msgstr ""
+"Cuando comparte su escritorio con otros, es posible que experimente una "
+"ralentización del rendimiento del sistema y una baja velocidad de Internet."
 
-#: C/account-irc.page:77(p)
+#: C/share-desktop.page:96(note/p)
 msgid ""
-"You can provide your real name in addition to your nickname. Other users "
-"will be able to see this when they view your information."
+"Some of your contacts may not be able to use this feature. It is necessary "
+"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
+"compatible remote desktop viewer application installed in their system."
 msgstr ""
-"Puede proporcionar su nombre real además de su apodo. Otros usuarios podrán "
-"verlo al ver su información."
+"Puede que algunos de sus contactos no puedan usar esta característica. Es "
+"necesario que tengan al menos la versión 2.28 de <app>Empathy</app> y una "
+"aplicación de visión remota de escritorios instalada en su sistema."
 
-#: C/account-irc.page:81(gui)
-msgid "Quit message"
-msgstr "Mensaje de salida"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:39(media)
+#| msgid ""
+#| "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
+msgctxt "_"
+msgid ""
+"external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
+msgstr ""
+"external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
 
-#: C/account-irc.page:82(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:45(media)
+#| msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
+msgctxt "_"
+msgid "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
+msgstr "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:53(media)
+#| msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
+msgctxt "_"
+msgid "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
+msgstr "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:62(media) C/status-icons.page:69(media)
+#| msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
+msgctxt "_"
 msgid ""
-"When you go offline, a quit message is sent to all the chat rooms you’re in "
-"and to all the users you’re having a private conversation with. Use this "
-"field to provide a custom quit message."
+"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
 msgstr ""
-"Cuando se desconecta se envía un mensaje de salida a todas las salas de chat "
-"en las que está y a todos los usuarios con los que tiene una conversación "
-"privada. Use este campo para proporcionar un mensaje personalizado."
+"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
 
-#: C/account-irc.page:94(title)
-msgid "IRC Networks"
-msgstr "Redes IRC"
+#: C/status-icons.page:7(info/desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "Entender los diversos estados e iconos de estado."
 
-#: C/account-irc.page:97(title)
-msgid "Networks"
-msgstr "Redes"
+#: C/status-icons.page:35(page/title)
+msgid "Status Types and Icons"
+msgstr "Tipos de estados e iconos"
 
-#: C/account-irc.page:99(p)
+#: C/status-icons.page:39(item/title)
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
-"another IRC network, you can add it to the list. You can also modify "
-"networks and remove them from the list."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png"
+"\">Available icon</media> <gui>Available</gui>"
 msgstr ""
-"<app>Empathy</app> incluye una lista de redes IRC populares. Si quiere usar "
-"otra red IRC puede añadirla a la lista. También puede modificar y quitar "
-"redes de la lista."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png\">Icono "
+"de «disponible»</media> <gui>Disponible</gui>"
 
-#: C/account-irc.page:104(p)
+#: C/status-icons.page:41(item/p)
 msgid ""
-"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
-"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
+"Use the <em>Available</em> status when you are at your computer and able to "
+"chat with your contacts. You can set a custom message for this status."
 msgstr ""
-"Para añadir una red a la lista pulse <media type=\"image\" mime=\"image/png"
-"\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Añadir</media>."
+"Use el estado <em>Disponible</em> cuando está en su equipo y disponible para "
+"charlar con sus contactos. Puede establecer un mensaje personalizado para "
+"este estado."
 
-#: C/account-irc.page:107(p)
+#: C/status-icons.page:45(item/title)
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"To modify a network in the list, select the network and click <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
-"height=\"16\">Edit</media>."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Busy icon</"
+"media> <gui>Busy</gui>"
 msgstr ""
-"Para modificar una red de la lista seleccione la red y pulse <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
-"height=\"16\">Editar</media>."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Icono de "
+"«ocupado»</media> <gui>Ocupado</gui>"
 
-#: C/account-irc.page:110(p)
+#: C/status-icons.page:47(item/p)
 msgid ""
-"To remove a network from the list, select the network and click <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
-"height=\"16\">Remove</media>."
+"Use the <em>Busy</em> status to let your contacts know that you don’t want "
+"to chat right now. They can still contact you, for instance if they have "
+"something urgent they need to discuss. By default, <app>Empathy</app> will "
+"not use notification bubbles and sounds when you are busy. You can set a "
+"custom message for this status."
 msgstr ""
-"Para quitar una red de la lista seleccione y pulse <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16"
-"\">Quitar</media>."
+"Use el estado <em>Ocupado</em> para hacer saber a sus contactos que no "
+"quiere charlar ahora. Aún podrán contactarle si, por ejemplo, tienen algo "
+"urgente que necesitan discutir. De forma predeterminada <app>Empathy</app> "
+"no usará las burbujas de notificación y sonidos cuando esté ocupado. Puede "
+"establecer un mensaje personalizado para este estado."
 
-#: C/account-irc.page:115(p)
+#: C/status-icons.page:53(item/title)
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"When adding or modifying a network, you can enter the following information:"
+"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Away icon</"
+"media> <gui>Away</gui>"
 msgstr ""
-"Al añadir o modificar una red puede introducir la siguiente información:"
+"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Icono de "
+"«ausente»</media> <gui>Ausente</gui>"
 
-#: C/account-irc.page:121(p)
+#: C/status-icons.page:55(item/p)
 msgid ""
-"This is the name of the network as you want it to appear in the list of "
-"networks."
+"Use the <em>Away</em> status when you are going away from your computer. "
+"<app>Empathy</app> automatically sets your status to Away if you do not use "
+"your computer for a while, or if your screensaver is on. By default, "
+"<app>Empathy</app> will not use notification bubbles and sounds when you are "
+"away. You can set a custom message for this status."
 msgstr ""
-"Este es el nombre de la red como quiere que aparezca en la lista de redes."
+"Use el estado <em>Ausente</em> cuando esté haciendo algo lejos del equipo. "
+"<app>Empathy</app> establece automáticamente su estado a Ausente si no usa "
+"su equipo durante un rato o si su salvapantallas está activado. De forma "
+"predeterminada <app>Empathy</app> no usará las burbujas de notificación y "
+"sonidos cuando esté ocupado. Puede establecer un mensaje personalizado para "
+"este estado."
 
-#: C/account-irc.page:125(gui)
-msgid "Charset"
-msgstr "Conjunto de caracteres"
+#: C/status-icons.page:62(item/title)
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline "
+"icon</media> <gui>Invisible</gui>"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Icono "
+"de «desconectado»</media> <gui>Invisible</gui>"
 
-#: C/account-irc.page:126(p)
+#: C/status-icons.page:64(item/p)
 msgid ""
-"This specifies the character encoding that is typically used on this "
-"network. A character encoding is a specific way of recording characters "
-"internally in a computer. There are many character encodings, and you need "
-"to use the same character encoding as other users to see their messages "
-"correctly."
+"When you set your status to <em>Invisible</em>, you will appear as offline "
+"to your contacts. You will still be connected to your accounts, and you "
+"still see your contacts’ statuses and start conversations with them."
 msgstr ""
-"Esto especifica la codificación de caracteres usada generalmente en esta "
-"red. Una codificación de caracteres es una forma específica de grabar los "
-"caracteres internamente en un equipo. Existen muchas configuraciones de "
-"caracteres y debe usar la misma configuración de caracteres que el resto de "
-"usuarios para poder ver sus mensajes correctamente."
+"Cuando su estado es <em>Invisible</em> aparecerá como desconectado para sus "
+"contactos. Aún estará conectado a sus cuentas, verá los estados de sus "
+"contactos y podrá iniciar conversaciones con ellos."
 
-#. Translators: Recommend character encodings that are common
-#.             for your language.
-#: C/account-irc.page:135(p)
+#: C/status-icons.page:69(item/title)
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
-"can handle text from most of the world's languages. Another common encoding "
-"for English and some other Western languages is ISO-8859-1."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline "
+"icon</media> <gui>Offline</gui>"
 msgstr ""
-"De forma predeterminada <app>Empathy</app> usa UTF-8, una codificación de "
-"caracteres moderna que puede gestionar texto en la mayoría de los idiomas "
-"del mundo. Otra configuración de caracteres común para inglés y otros "
-"idiomas occidentales es ISO-8859-1."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Icono "
+"de «desconectado»</media> <gui>Desconectado</gui>"
 
-#: C/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "Servidores"
+#: C/status-icons.page:71(item/p)
+msgid ""
+"Setting your status to <em>Offline</em> disconnects you from all of your "
+"accounts."
+msgstr ""
+"Establecer su estado como <em>Desconectado</em> le desconecta de todas sus "
+"cuentas."
+
+#: C/video-call.page:10(info/desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "Iniciar una conversación de vídeo con uno de sus contactos."
+
+#: C/video-call.page:29(page/title)
+msgid "Start a video conversation"
+msgstr "Comenzar una conversación de vídeo"
 
-#: C/account-irc.page:142(p)
+#: C/video-call.page:31(page/p)
 msgid ""
-"An IRC network may have many servers you can connect to. When you are "
-"connected to a server on a particular network, you can communicate with all "
-"users on all other servers on that network. You can add and remove servers "
-"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
+"If you have a webcam, you can call your contacts and have a video "
+"conversation with them. This feature only works with certain types of "
+"accounts, and it requires the other person to have an application that "
+"supports video calls."
 msgstr ""
-"Una red IRC puede tener muchos servidores a los que se puede conectar. "
-"Cuando está conectado a un servidor en una red en particular, puede "
-"comunicarse con todos los usuarios en todos los servidores de esa red. Puede "
-"añadir y quitar servidores para esa red usando los botones <gui>Añadir</gui> "
-"y <gui>Quitar</gui>."
+"Si tiene una cámara web puede llamar a sus contactos y tener conversaciones "
+"de vídeo con ellos. Esta característica sólo funciona con ciertos tipos de "
+"cuentas y requiere que la otra persona tenga una aplicación que soporte "
+"llamadas de vídeo."
 
-#: C/account-irc.page:147(p)
+#: C/video-call.page:38(item/p)
 msgid ""
-"When a server is selected, click the field under <gui>Server</gui> or "
-"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
-"to focus the field, and press the space bar to begin editing."
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+"next to the name of the contact you wish to call and choose <gui style="
+"\"menuitem\">Video Call</gui>."
 msgstr ""
-"Cuando un servidor esté seleccionado, pulse el campo bajo <gui>Servidor</"
-"gui> o <gui>Puerto</gui> para editarlo. Alternativamente, use las flechas "
-"izquierda y derecha para dar el foco al campo y pulse la barra espaciadora "
-"para comenzar a editarlo."
+"Desde la ventana <gui>Lista de contactos</gui> pulse el icono de <media type="
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">vídeo llamada</"
+"media> junto al nombre del contacto al que desea llamar y seleccione <gui "
+"style=\"menuitem\">Llamada de vídeo</gui>."
 
-#: C/account-irc.page:151(p)
+#: C/video-call.page:55(note/p)
 msgid ""
-"Select the check box in the <gui>SSL</gui> column to encrypt all "
-"communication with a server. Note that this does not prevent other users on "
-"the network from seeing what you write on public chat rooms."
+"To turn a video conversation into an audio conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
 msgstr ""
-"Seleccione la casilla de verificación en la columna <gui>SSL</gui> para "
-"cifrar toda la comunicación con el servidor. Note que esto no previene que "
-"otros usuarios en la red vean lo que escribe en salas de chat públicas."
+"Para convertir una conversación de vídeo en una de sonido, elija "
+"<guiseq><gui style=\"menu\">Vídeo</gui><gui style=\"menuitem\">Vídeo "
+"apagado</gui></guiseq>."
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/index.page:0(None)
-msgid "translator-credits"
-msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2008-2010"
+#: C/video-call.page:61(section/title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "Iniciar una conversación de vídeo con uno de sus metacontactos."
+
+#: C/video-call.page:69(item/p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
+msgstr ""
+"Seleccione el contacto con el que quiere tener la conversacio�n y, del menu�, "
+"seleccione <gui style=\"menuitem\">Llamada de vídeo</gui>."
+
+#~ msgid "milo@ubuntu.com"
+#~ msgstr "milo@ubuntu.com"
+
+#~ msgid "shaunm@gnome.org"
+#~ msgstr "shaunm@gnome.org"
+
+#~ msgid "Available icon"
+#~ msgstr "Icono de disponible"
+
+#~ msgid "Available"
+#~ msgstr "Disponible"
+
+#~ msgid "Busy icon"
+#~ msgstr "Icono de ocupado"
+
+#~ msgid "Busy"
+#~ msgstr "Ocupado"
+
+#~ msgid "Away icon"
+#~ msgstr "Icono de ausente"
+
+#~ msgid "Away"
+#~ msgstr "Ausente"
+
+#~ msgid "Offline icon"
+#~ msgstr "Icono de desconectado"
+
+#~ msgid "Invisible"
+#~ msgstr "Invisible"
+
+#~ msgid "Offline"
+#~ msgstr "Desconectado"
+
+#~ msgid "kittykat3756@gmail.com"
+#~ msgstr "kittykat3756@gmail.com"
+
+#~ msgid "jwcampbell@gmail.com"
+#~ msgstr "jwcampbell@gmail.com"
+
+#~ msgid "philbull@gmail.com"
+#~ msgstr "philbull@gmail.com"
+
+#~ msgid "I'd like to see this played up a bit more."
+#~ msgstr "Me gustaría ver esto explicado un poco más."
+
+#~ msgid "shaunm"
+#~ msgstr "shaunm"
+
+#~ msgid ""
+#~ "Empathy no longer allows you to create an IRC account without a valid "
+#~ "nick. I've removed the guide link. Remove the text."
+#~ msgstr ""
+#~ "Empathy ya no le permite crear una cuenta de IRC sin un apodo válido. Se "
+#~ "ha quitado el enlace de guía. Quitar el texto."
+
+#~ msgid "Install telepathy-idle"
+#~ msgstr "Instale telepathy-idle"
+
+#~ msgid "peter.haslam@freenet.de"
+#~ msgstr "peter.haslam@freenet.de"
+
+#~ msgid "Icon for audio conversation"
+#~ msgstr "Icono para la conversación de sonido"
+
+#~ msgid "Icon for video conversation"
+#~ msgstr "Icono para la conversación de vídeo"
+
+#~ msgid ""
+#~ "I'd like to do tables like this using nothing for No and ✔ for Yes, but "
+#~ "we need to look at the accessibility impact. I've <link href=\"http://"
+#~ "mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006.html"
+#~ "\">asked the accessibility team</link> for input."
+#~ msgstr ""
+#~ "Me gustaría poner tablas como ésta sin usar nada para No y ✔ para Sí, "
+#~ "pero se debe tener en cuenta el impacto en la accesibilidad. Ya <link "
+#~ "href=\"http://mail.gnome.org/archives/gnome-doc-list/2009-September/"
+#~ "msg00006.html\">he preguntado al equipo de accesibilidad</link>."
+
+#~ msgid ""
+#~ "There's recent work on telepathy-butterfly and papyon to support audio "
+#~ "and video for MSN. It might be released in time for 2.28, but since it "
+#~ "doesn't follow the Gnome release schedule, I can't be sure. If it looks "
+#~ "like it's going to ship, let's mark it Yes."
+#~ msgstr ""
+#~ "Existe trabajo reciente en telepathy-butterfly y papyon para soportar "
+#~ "sonido y vídeo para MSN. Puede que se publique a tiempo para 2.28 pero ya "
+#~ "que no sigue la planificación de publicaciones de GNOME no se puede estar "
+#~ "seguro. Si parece que va a dar tiempo se incluirá."
+
+#~ msgid "Resource"
+#~ msgstr "Recurso"
+
+#~ msgid "Priority"
+#~ msgstr "Prioridad"
+
+#~ msgid "Network"
+#~ msgstr "Red"
+
+#~ msgid "Nickname"
+#~ msgstr "Apodo"
+
+#~ msgid "Password"
+#~ msgstr "Contraseña"
+
+#~ msgid "Real name"
+#~ msgstr "Nombre real"
+
+#~ msgid "Quit message"
+#~ msgstr "Mensaje de salida"
+
+#~ msgid "Charset"
+#~ msgstr "Conjunto de caracteres"
+
+#~ msgid "Servers"
+#~ msgstr "Servidores"
+
+#~ msgid "Edit, remove and add a custom message"
+#~ msgstr "Editar, quitar y añadir un mensaje personalizado"
+
+#~ msgid ""
+#~ "To add a new custom message, from the <gui>Add New Preset</gui> section:"
+#~ msgstr ""
+#~ "Para añadir un mensaje personalizado nuevo, desde la sección <gui>Añadir "
+#~ "estado guardado</gui> "
+
+#~ msgid ""
+#~ "Click on the drop-down list to select the status you want to set a custom "
+#~ "message to."
+#~ msgstr ""
+#~ "Pulse en la lista desplegable para seleccionar el estado en el que quiere "
+#~ "establecer un mensaje personalizado."
+
+#~ msgid "Click on the text box, and type the new custom message."
+#~ msgstr "Pulse en la caja de texto y escriba el mensaje personalizado nuevo."
+
+#~ msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+#~ msgstr ""
+#~ "Pulse <gui>Añadir</gui> para añadir un mensaje nuevo a los guardados."
 
 #~ msgid "Click on <gui style=\"button\">Remove</gui>."
 #~ msgstr "Pulse <gui style=\"button\">Quitar</gui>."
@@ -3606,9 +3832,6 @@ msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2008-2010"
 #~ msgid "Click the <gui style=\"button\">Add</gui> button."
 #~ msgstr "Pulse el botón <gui style=\"button\">Añadir</gui>."
 
-#~ msgid "Click <gui>Create</gui>."
-#~ msgstr "Pulse <gui>Crear</gui>."
-
 #~ msgid "Click <gui style=\"button\">Connect</gui> to enable the new account."
 #~ msgstr ""
 #~ "Pulse <gui style=\"button\">Conectar</gui> para activar la nueva cuenta."
diff --git a/help/fr/fr.po b/help/fr/fr.po
index f0c052701..b5a54d6ab 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -1,3490 +1,896 @@
-# French translation of empathy documentation.
+# French translation of cheese documentation.
 # Copyright (C) 2008-2011 Free Software Foundation, Inc.
-# This file is distributed under the same license as the empathy
+# This file is distributed under the same license as the cheese
 # documentation package.
 #
-# Marc Veillet <marc.veillet@globetrotter.net>, 2008.
-# Bruno Brouard <annoa.b@gmail.com>, 2008, 2011.
-# Claude Paroz <claude@2xlibre.net>, 2008, 2010.
-# Frédéric Peters <fpeters@0d.be>, 2009.
+# Bruno Brouard <annoa.b@gmail.com>, 2008-2011
+# Claude Paroz <claude@2xlibre.net>, 2008-2010
+# Yannick Tailliez <ytdispatch-libre@yahoo.com>, 2008.
+# Laurent Coudeur <laurentc@iol.ie>, 2009.
+# Baptiste Mille-Matthias <bmm80@free.fr>, 2009 (figures)
+# Luc Pionchon <pionchon.luc@gmail.com>, 2011
+# Luc Guillemin <luc.guillemin@gmail.com>, 2011
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy help fr\n"
-"POT-Creation-Date: 2011-12-20 12:18+0000\n"
-"PO-Revision-Date: 2011-12-20 21:45+0100\n"
+"Project-Id-Version: cheese doc fr\n"
+"POT-Creation-Date: 2012-01-01 18:48+0000\n"
+"PO-Revision-Date: 2012-02-12 11:00+0100\n"
 "Last-Translator: Bruno Brouard <annoa.b@gmail.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:39(None) C/audio-video.page:70(None)
-#: C/audio-call.page:36(None)
-msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
-msgstr ""
-"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
-
-#: C/video-call.page:10(desc)
-msgid "Start a video conversation with one of your contacts."
-msgstr "Commencer une conversation vidéo avec un de vos contacts."
-
-#: C/video-call.page:22(name) C/status-icons.page:16(name)
-#: C/share-desktop.page:14(name) C/set-custom-status.page:19(name)
-#: C/send-file.page:21(name) C/salut-protocol.page:18(name)
-#: C/remove-account.page:19(name) C/prob-conn-neterror.page:19(name)
-#: C/prob-conn-name.page:18(name) C/prob-conn-auth.page:21(name)
-#: C/prob-conn-acctdisabled.page:19(name) C/prev-conv.page:17(name)
-#: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
-#: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
-#: C/irc-manage.page:20(name) C/irc-join-room.page:16(name)
-#: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name)
-#: C/introduction.page:13(name) C/index.page:19(name)
-#: C/import-account.page:23(name) C/hide-contacts.page:11(name)
-#: C/group-conversations.page:19(name) C/geolocation-what-is.page:18(name)
-#: C/geolocation-turn.page:18(name) C/geolocation-supported.page:16(name)
-#: C/geolocation-privacy.page:17(name) C/geolocation-not-showing.page:17(name)
-#: C/geolocation.page:17(name) C/favorite-rooms.page:14(name)
-#: C/disable-account.page:21(name) C/create-account.page:19(name)
-#: C/audio-video.page:17(name) C/audio-call.page:19(name)
-#: C/add-account.page:21(name)
-msgid "Milo Casagrande"
-msgstr "Milo Casagrande"
-
-#: C/video-call.page:23(email) C/status-icons.page:17(email)
-#: C/share-desktop.page:15(email) C/set-custom-status.page:20(email)
-#: C/send-file.page:22(email) C/salut-protocol.page:19(email)
-#: C/remove-account.page:20(email) C/prob-conn-neterror.page:20(email)
-#: C/prob-conn-name.page:19(email) C/prob-conn-auth.page:22(email)
-#: C/prob-conn-acctdisabled.page:20(email) C/prev-conv.page:18(email)
-#: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
-#: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
-#: C/irc-manage.page:21(email) C/irc-join-room.page:17(email)
-#: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email)
-#: C/introduction.page:14(email) C/index.page:20(email)
-#: C/import-account.page:24(email) C/hide-contacts.page:12(email)
-#: C/group-conversations.page:20(email) C/geolocation-what-is.page:19(email)
-#: C/geolocation-turn.page:19(email) C/geolocation-supported.page:17(email)
-#: C/geolocation-privacy.page:18(email)
-#: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
-#: C/favorite-rooms.page:15(email) C/disable-account.page:22(email)
-#: C/create-account.page:20(email) C/audio-video.page:18(email)
-#: C/audio-call.page:20(email) C/add-account.page:22(email)
-msgid "milo@ubuntu.com"
-msgstr "milo@ubuntu.com"
-
-#: C/video-call.page:26(p) C/status-icons.page:24(p)
-#: C/share-desktop.page:22(p) C/set-custom-status.page:23(p)
-#: C/send-message.page:21(p) C/send-file.page:25(p)
-#: C/salut-protocol.page:22(p) C/remove-account.page:23(p)
-#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:23(p)
-#: C/prob-conn-name.page:22(p) C/prob-conn-auth.page:25(p)
-#: C/prob-conn-acctdisabled.page:23(p) C/prev-conv.page:25(p)
-#: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p)
-#: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
-#: C/irc-manage.page:24(p) C/irc-join-room.page:20(p)
-#: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p)
-#: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p)
-#: C/hide-contacts.page:15(p) C/group-conversations.page:23(p)
-#: C/geolocation-what-is.page:22(p) C/geolocation-turn.page:22(p)
-#: C/geolocation-supported.page:20(p) C/geolocation-privacy.page:21(p)
-#: C/geolocation-not-showing.page:21(p) C/geolocation.page:21(p)
-#: C/favorite-rooms.page:18(p) C/disable-account.page:29(p)
-#: C/create-account.page:23(p) C/change-status.page:28(p)
-#: C/audio-video.page:21(p) C/audio-call.page:23(p) C/add-contact.page:22(p)
-#: C/add-account.page:29(p) C/accounts-window.page:22(p)
-#: C/account-jabber.page:18(p) C/account-irc.page:20(p)
-msgid "Creative Commons Share Alike 3.0"
-msgstr "Creative Commons Share Alike 3.0"
-
-#: C/video-call.page:29(title)
-msgid "Start a video conversation"
-msgstr "Mise en place d'une conversation vidéo"
-
-#: C/video-call.page:31(p)
-msgid ""
-"If you have a webcam, you can call your contacts and have a video "
-"conversation with them. This feature only works with certain types of "
-"accounts, and it requires the other person to have an application that "
-"supports video calls."
-msgstr ""
-"Si vous avez une webcam, vous pouvez appeler vos contacts et avoir une "
-"conversation vidéo avec eux. Cette fonctionnalité n'est disponible qu'avec "
-"certains types de comptes et votre contact doit utiliser une application qui "
-"supporte les appels vidéos."
-
-#: C/video-call.page:38(p)
-msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
-"next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Video Call</gui>."
-msgstr ""
-"À partir de la fenêtre <gui>Liste des contacts</gui>, cliquez sur l'icône "
-"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png"
-"\">Appel vidéo</media> à côté du contact que vous souhaitez appeler et "
-"choisissez <gui style=\"menuitem\">Appel vidéo</gui>."
-
-#: C/video-call.page:44(p) C/audio-call.page:42(p)
-msgid ""
-"A new window will open. When the connection is established, you will see "
-"<gui>Connected</gui> at the bottom of the window, along with the total "
-"conversation time."
-msgstr ""
-"Une nouvelle fenêtre s'ouvre. Quand la connexion est établie, vous voyez "
-"apparaître <gui>Connecté</gui> en bas de la fenêtre, ainsi que la durée "
-"totale de la conversation."
-
-#: C/video-call.page:49(p) C/audio-call.page:48(p)
-msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
-msgstr ""
-"Pour terminer la conversation, cliquez sur <gui style=\"button\">Raccrocher</"
-"gui>."
-
-# "Send video" pour transformer une conversation video en audio ?
-#: C/video-call.page:55(p)
-msgid ""
-"To turn a video conversation into an audio conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
-msgstr ""
-"Pour transformer une conversation vidéo en une conversation audio, "
-"choisissez <guiseq><gui style=\"menu\">Vidéo</gui><gui style=\"menuitem"
-"\">Vidéo désactivée</gui></guiseq>."
-
-#: C/video-call.page:61(title)
-msgid "Start a video conversation with a meta-contact"
-msgstr "Commencer une conversation vidéo avec un méta-contact"
-
-#: C/video-call.page:64(p) C/send-message.page:53(p) C/audio-call.page:66(p)
-msgid ""
-"From the <gui>Contact List</gui> window, right-click on the meta-contact."
-msgstr ""
-"Dans la fenêtre <gui>Liste des contacts</gui>, faites un clic droit sur le "
-"méta-contact."
-
-#: C/video-call.page:69(p)
-msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Video Call</gui>."
-msgstr ""
-"Sélectionnez le contact avec lequel vous voulez discuter et choisissez <gui "
-"style=\"menuitem\">Appel vidéo</gui> dans le menu."
-
-#: C/video-call.page:76(p) C/send-message.page:65(p) C/audio-call.page:78(p)
-msgid ""
-"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
-"contact in the <gui>Contact List</gui> window, and stop over it for a "
-"second: a small pop-up message will appear showing the number of the "
-"contacts that form the meta-contact."
-msgstr ""
-"Pour savoir si un contact est un <em>méta-contact</em>, placez votre souris "
-"sur un contact dans la <gui>Liste des contacts</gui> et laissez-la immobile "
-"pendant environ une seconde : une infobulle apparaît pour afficher le nombre "
-"de contacts qui forment le méta-contact."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:39(None)
-msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
-msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:45(None)
-msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
-msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:53(None)
-msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
-msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/status-icons.page:62(None) C/status-icons.page:69(None)
-msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
-msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
-
-#: C/status-icons.page:7(desc)
-msgid "Understanding the various statuses and status icons."
-msgstr "Comprendre les différents états et les icônes d'état."
-
-#: C/status-icons.page:20(name) C/salut-protocol.page:36(cite)
-#: C/prev-conv.page:21(name) C/import-account.page:27(name)
-#: C/disable-account.page:25(name) C/audio-video.page:109(cite)
-#: C/audio-video.page:117(cite) C/add-account.page:25(name)
-#: C/accounts-window.page:18(name) C/account-jabber.page:14(name)
-#: C/account-irc.page:16(name)
-msgid "Shaun McCance"
-msgstr "Shaun McCance"
-
-#: C/status-icons.page:21(email) C/prev-conv.page:22(email)
-#: C/import-account.page:28(email) C/disable-account.page:26(email)
-#: C/add-account.page:26(email) C/accounts-window.page:19(email)
-#: C/account-jabber.page:15(email) C/account-irc.page:17(email)
-msgid "shaunm@gnome.org"
-msgstr "shaunm@gnome.org"
-
-#: C/status-icons.page:35(title)
-msgid "Status Types and Icons"
-msgstr "Types et icônes d'états"
-
-#: C/status-icons.page:39(media)
-msgid "Available icon"
-msgstr "Icône « Disponible »"
-
-#: C/status-icons.page:40(gui)
-msgid "Available"
-msgstr "Disponible"
-
-#: C/status-icons.page:41(p)
-msgid ""
-"Use the <em>Available</em> status when you are at your computer and able to "
-"chat with your contacts. You can set a custom message for this status."
-msgstr ""
-"Utilisez l'état <em>Disponible</em> quand vous êtes à votre poste et que "
-"vous pouvez discuter avec vos contacts. Vous pouvez créer un message "
-"personnalisé pour cet état."
-
-#: C/status-icons.page:45(media)
-msgid "Busy icon"
-msgstr "Icône « Occupé »"
-
-#: C/status-icons.page:46(gui)
-msgid "Busy"
-msgstr "Occupé"
 
-#: C/status-icons.page:47(p)
-msgid ""
-"Use the <em>Busy</em> status to let your contacts know that you don’t want "
-"to chat right now. They can still contact you, for instance if they have "
-"something urgent they need to discuss. By default, <app>Empathy</app> will "
-"not use notification bubbles and sounds when you are busy. You can set a "
-"custom message for this status."
-msgstr ""
-"Utilisez l'état <em>Occupé</em> quand vous voulez indiquer à vos contacts "
-"que vous ne voulez pas discuter pour le moment. Ils peuvent toujours prendre "
-"contact avec vous, s'ils ont quelque chose d'urgent à vous dire par exemple. "
-"Par défaut, <app>Empathy</app> n'utilise aucune alerte visuelle ou sonore "
-"quand vous êtes occupé. Vous pouvez définir un message personnalisé pour cet "
-"état."
-
-#: C/status-icons.page:53(media)
-msgid "Away icon"
-msgstr "Icône « Absent »"
-
-#: C/status-icons.page:54(gui)
-msgid "Away"
-msgstr "Absent"
-
-#: C/status-icons.page:55(p)
-msgid ""
-"Use the <em>Away</em> status when you are going away from your computer. "
-"<app>Empathy</app> automatically sets your status to Away if you do not use "
-"your computer for a while, or if your screensaver is on. By default, "
-"<app>Empathy</app> will not use notification bubbles and sounds when you are "
-"away. You can set a custom message for this status."
-msgstr ""
-"Utilisez l'état <em>Absent</em> quand vous vous absentez de votre "
-"ordinateur. <app>Empathy</app> bascule automatiquement sur l'état « Absent » "
-"si vous n'utilisez pas votre ordinateur pendant un certain temps, ou si "
-"votre écran de veille se déclenche. Par défaut, <app>Empathy</app> n'utilise "
-"aucune alerte visuelle ou sonore quand vous êtes absent. Vous pouvez définir "
-"un message personnalisé pour cet état."
-
-#: C/status-icons.page:62(media) C/status-icons.page:69(media)
-msgid "Offline icon"
-msgstr "Icône « Déconnecté »"
-
-#: C/status-icons.page:63(gui)
-msgid "Invisible"
-msgstr "Invisible"
-
-#: C/status-icons.page:64(p)
-msgid ""
-"When you set your status to <em>Invisible</em>, you will appear as offline "
-"to your contacts. You will still be connected to your accounts, and you "
-"still see your contacts’ statuses and start conversations with them."
-msgstr ""
-"Quand vous utilisez le statut <em>Invisible</em>, vous apparaissez "
-"déconnecté pour vos contacts. Vous restez connecté à vos comptes, vous "
-"pouvez toujours voir le statut de vos contacts et démarrer une discussion "
-"avec eux."
-
-#: C/status-icons.page:70(gui)
-msgid "Offline"
-msgstr "Déconnecté"
-
-#: C/status-icons.page:71(p)
-msgid ""
-"Setting your status to <em>Offline</em> disconnects you from all of your "
-"accounts."
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
 msgstr ""
-"Passez au statut <em>Déconnecté</em> pour vous déconnecter de tous vos "
-"comptes."
-
-#: C/share-desktop.page:7(desc)
-msgid "Show your desktop to your contacts."
-msgstr "Montrer son bureau à ses contacts."
-
-#: C/share-desktop.page:18(name)
+"Bruno Brouard <annoa.b@gmail.com>, 2008-2009,2012\n"
+"Claude Paroz <claude@2xlibre.net>, 2008-2010\n"
+"Yannick Tailliez <ytdispatch-libre@yahoo.com>, 2008\n"
+"Laurent Coudeur <laurentc@iol.ie>, 2009\n"
+"Luc Pionchon <pionchon.luc@gmail.com>, 2011\n"
+"Luc Guillemin <luc.guillemin@gmail.com>, 2011"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:26(media)
+msgctxt "_"
+msgid ""
+"external ref='figures/cheese.png' md5='e801510f287b3db068beb2daf8989124'"
+msgstr ""
+"external ref='figures/cheese.png' md5='e801510f287b3db068beb2daf8989124'"
+
+#: C/index.page:7(info/title)
+msgctxt "link"
+msgid "Cheese Webcam Booth"
+msgstr "Studio webcam Cheese"
+
+#: C/index.page:8(info/title)
+msgctxt "text"
+msgid "Cheese Webcam Booth"
+msgstr "Studio webcam Cheese"
+
+#: C/index.page:11(credit/name) C/effects-apply.page:9(credit/name)
+#: C/introduction.page:11(credit/name) C/mode-wide.page:10(credit/name)
+#: C/photo-delete.page:10(credit/name) C/photo-save.page:10(credit/name)
+#: C/photo-take.page:15(credit/name) C/photo-view.page:10(credit/name)
+#: C/pref-burst-mode.page:10(credit/name)
+#: C/pref-countdown.page:10(credit/name) C/pref-flash.page:9(credit/name)
+#: C/pref-image-properties.page:10(credit/name)
+#: C/pref-photo-resolution.page:10(credit/name)
+#: C/video-record.page:10(credit/name)
+msgid "Julita Inca"
+msgstr "Julita Inca"
+
+#: C/index.page:13(credit/years) C/index.page:19(credit/years)
+#: C/effects-apply.page:11(credit/years) C/introduction.page:13(credit/years)
+#: C/mode-wide.page:12(credit/years) C/photo-delete.page:12(credit/years)
+#: C/photo-save.page:12(credit/years) C/photo-take.page:17(credit/years)
+#: C/photo-view.page:12(credit/years) C/pref-burst-mode.page:12(credit/years)
+#: C/pref-countdown.page:12(credit/years) C/pref-flash.page:11(credit/years)
+#: C/pref-image-properties.page:12(credit/years)
+#: C/pref-photo-resolution.page:12(credit/years)
+#: C/video-record.page:12(credit/years)
+msgid "2011"
+msgstr "2011"
+
+#: C/index.page:17(credit/name) C/effects-apply.page:14(credit/name)
+#: C/introduction.page:16(credit/name) C/mode-wide.page:15(credit/name)
+#: C/photo-delete.page:15(credit/name) C/photo-save.page:15(credit/name)
+#: C/photo-take.page:20(credit/name) C/photo-view.page:15(credit/name)
+#: C/pref-burst-mode.page:15(credit/name)
+#: C/pref-countdown.page:15(credit/name) C/pref-flash.page:14(credit/name)
+#: C/pref-image-properties.page:15(credit/name)
+#: C/pref-photo-resolution.page:15(credit/name)
+#: C/video-record.page:15(credit/name)
 msgid "Ekaterina Gerasimova"
 msgstr "Ekaterina Gerasimova"
 
-#: C/share-desktop.page:19(email)
-msgid "kittykat3756@gmail.com"
-msgstr "kittykat3756@gmail.com"
-
-#: C/share-desktop.page:33(title)
-msgid "Share your desktop"
-msgstr "Partage du bureau"
-
-#: C/share-desktop.page:35(p)
-msgid ""
-"It is possible to share your desktop with some of your contacts. You can use "
-"this functionality to show your desktop to your contacts to, for example, "
-"ask for help or help your contacts resolve a problem."
-msgstr ""
-"Vous avez la possibilité de partager votre bureau avec certains de vos "
-"contacts. Vous pouvez utiliser cette fonctionnalité pour montrer votre "
-"bureau à vos contacts afin de, par exemple, leur demander de l'aide ou "
-"encore les assister dans la résolution d'un problème."
-
-#: C/share-desktop.page:42(p)
-msgid ""
-"To be able to share your desktop, you need to have a VNC server, which has "
-"support for the feature, installed on your system. <app>Vino</app>, the "
-"GNOME VNC server, has the required support."
-msgstr ""
-"Pour partager votre bureau vous avez besoin d'un serveur VNC qui prend en "
-"charge cette fonctionnalité, installé sur votre système. <app>Vino</app>, le "
-"serveur VNC de GNOME, a la configuration requise."
-
-#: C/share-desktop.page:51(p)
-msgid "From the <gui>Contact List</gui> window, do one of the following:"
-msgstr ""
-"À partir de la fenêtre <gui>Liste des contacts</gui>, effectuez une des "
-"actions suivantes :"
-
-#: C/share-desktop.page:56(p)
-msgid ""
-"Select the contact you want to share your desktop with and choose "
-"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></"
-"guiseq>."
-msgstr ""
-"Sélectionnez le contact avec lequel vous voulez partager votre bureau, et "
-"sélectionnez <guiseq><gui>Édition</gui><gui>Contact</gui><gui>Partager mon "
-"bureau</gui></guiseq>."
-
-#: C/share-desktop.page:63(p)
-msgid ""
-"Right-click on the name of the contact you want to share your desktop with "
-"and select <gui>Share My Desktop</gui>."
-msgstr ""
-"Faites un clic droit sur le contact avec lequel vous voulez partager votre "
-"bureau et sélectionnez <gui>Partager mon bureau</gui>."
-
-#: C/share-desktop.page:71(p)
-msgid ""
-"An invitation to view your desktop will be sent to the contact you have "
-"selected. To view your desktop, they will need to accept it."
-msgstr ""
-"Une invitation va être envoyée aux contacts que vous avez sélectionnés. Pour "
-"voir votre bureau, ils devront accepter l'invitation."
-
-#: C/share-desktop.page:77(p)
-msgid ""
-"You can disconnect the contact from your computer using your desktop sharing "
-"application."
-msgstr ""
-"Vous pouvez déconnecter le contact de votre ordinateur en utilisant votre "
-"application de partage de bureau."
-
-#: C/share-desktop.page:82(p)
-msgid ""
-"For more information about how to use the remote desktop sharing "
-"application, refer to its help."
-msgstr ""
-"Pour plus de détails sur l'utilisation de l'application de contrôle à "
-"distance, référez-vous à sa documentation."
-
-#: C/share-desktop.page:90(p)
-msgid ""
-"When you share your desktop with someone else, it is possible to experience "
-"system performance slowdown and low Internet speed."
-msgstr ""
-"Quand vous partagez votre bureau avec un autre utilisateur, il est possible "
-"que vous remarquiez une baisse des performances du système ainsi qu'un "
-"ralentissement de la connexion internet."
-
-#: C/share-desktop.page:96(p)
-msgid ""
-"Some of your contacts may not be able to use this feature. It is necessary "
-"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
-"compatible remote desktop viewer application installed in their system."
-msgstr ""
-"Certains de vos contacts ne prendront pas nécessairement en charge cette "
-"fonctionnalité. Ils devront utiliser au minimum la version 2.28 "
-"d'<app>Empathy</app> et installer une application de contrôle à distance "
-"compatible."
-
-#: C/set-custom-status.page:9(desc)
-msgid "Add, edit or delete personal messages for your status."
-msgstr ""
-"Ajouter, modifier ou supprimer les messages personnalisés pour votre état."
-
-#: C/set-custom-status.page:15(name)
-msgid "Jim Campbell"
-msgstr "Jim Campbell"
-
-#: C/set-custom-status.page:16(email)
-msgid "jwcampbell@gmail.com"
-msgstr "jwcampbell@gmail.com"
-
-#: C/set-custom-status.page:34(title)
-msgid "Set a custom message"
-msgstr "Paramétrage d'un message personnalisé"
-
-#: C/set-custom-status.page:36(p)
-msgid ""
-"Sometimes you may want to set a custom message for your status, for example "
-"to let people know that you will be unavailable for a certain period of time."
-msgstr ""
-"Dans certains cas, vous voudrez paramétrer un message personnalisé pour "
-"votre état, par exemple pour vous permettre d'indiquer à vos contacts que "
-"vous êtes indisponible un certain temps."
-
-#: C/set-custom-status.page:40(p)
-msgid ""
-"It is possible to set a custom message based on the different statuses "
-"available."
-msgstr ""
-"Vous pouvez paramétrer un message personnalisé pour chaque état disponible."
-
-#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p)
-msgid ""
-"From the <gui>Contact List</gui> window, click on the drop-down list at the "
-"top."
-msgstr ""
-"Cliquez sur la liste déroulante en haut de la fenêtre <gui>Liste des "
-"contacts</gui>."
-
-#: C/set-custom-status.page:52(p)
-msgid ""
-"Select the status you want to add a custom message to. You have to select "
-"the one identified with the label <gui>Custom Message</gui>."
-msgstr ""
-"Sélectionnez l'état auquel vous voulez ajouter un message personnalisé. Vous "
-"devez sélectionner celui libellé <gui>Message personnalisé</gui>."
-
-#: C/set-custom-status.page:58(p)
-msgid ""
-"Enter your custom message in the text box at the top of the window, and "
-"press <key>Enter</key> to set the message."
-msgstr ""
-"Saisissez votre message personnalisé dans la zone de texte en haut de la "
-"fenêtre et appuyez sur <key>Entrée</key> pour définir le message."
-
-#: C/set-custom-status.page:64(p)
-msgid ""
-"If you want to set the custom message as a favorite, saving it in order to "
-"use it again, click on the little star on the right of the text box where "
-"you wrote your custom message."
-msgstr ""
-"Si vous voulez paramétrer ce message personnalisé comme favori et "
-"l'enregistrer pour le réutiliser plus tard, cliquez sur la petite étoile à "
-"droite de la zone de texte où vous venez de saisir le message."
-
-#: C/set-custom-status.page:69(p)
-msgid ""
-"If you do not do it, the custom message will not be available the next time "
-"you use <app>Empathy</app>. It will be saved only for the current session."
-msgstr ""
-"Si vous ne le faites pas, le message personnalisé ne sera pas disponible la "
-"prochaine fois que vous utiliserez <app>Empathy</app>. Il est enregistré "
-"pour la session actuelle uniquement."
-
-#: C/set-custom-status.page:78(title)
-msgid "Edit, remove and add a custom message"
-msgstr "Modification, suppression ou ajout d'un message personnalisé"
-
-# Je ne trouve pas le menu en question dans l'ui
-#: C/set-custom-status.page:88(p)
-msgid "Select <gui>Edit Custom Message</gui>."
-msgstr "Sélectionnez <gui>Édition des messages personnalisés</gui>."
-
-#: C/set-custom-status.page:95(p)
-msgid "To edit a custom message:"
-msgstr "Pour modifier un message personnalisé :"
-
-#: C/set-custom-status.page:100(p)
-msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"edit and double-click on it."
-msgstr ""
-"Dans la zone de texte <gui>Messages prédéfinis enregistrés</gui>, "
-"sélectionnez puis faites un double clic sur le message que vous voulez "
-"modifier."
-
-#: C/set-custom-status.page:106(p)
-msgid "Type the new custom message and press <key>Enter</key> to modify it."
-msgstr ""
-"Saisissez le nouveau message personnalisé et appuyez sur <key>Entrée</key> "
-"pour le modifier."
-
-#: C/set-custom-status.page:113(p)
-msgid "To remove a custom message:"
-msgstr "Pour supprimer un message personnalisé :"
-
-#: C/set-custom-status.page:118(p)
-msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"remove."
-msgstr ""
-"Dans la zone de texte <gui>Messages prédéfinis enregistrés</gui>, "
-"sélectionnez le message que vous voulez supprimer."
-
-#: C/set-custom-status.page:124(p)
-msgid "Click on the <gui>Remove</gui> button."
-msgstr "Cliquez sur le bouton <gui>Supprimer</gui>."
-
-#: C/set-custom-status.page:131(p)
-msgid ""
-"To add a new custom message, from the <gui>Add New Preset</gui> section:"
-msgstr ""
-"Pour ajouter un nouveau message personnalisé, à partir de <gui>Ajouter "
-"nouveau message prédéfini</gui> :"
-
-#: C/set-custom-status.page:136(p)
-msgid ""
-"Click on the drop-down list to select the status you want to set a custom "
-"message to."
-msgstr ""
-"Cliquez sur la liste déroulante pour sélectionner l'état pour lequel vous "
-"voulez saisir un message personnalisé."
-
-#: C/set-custom-status.page:142(p)
-msgid "Click on the text box, and type the new custom message."
-msgstr ""
-"Cliquez dans le champ de saisie et saisissez le nouveau message personnalisé."
-
-#: C/set-custom-status.page:147(p)
-msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
-msgstr ""
-"Cliquez sur <gui>Ajouter</gui> pour ajouter le nouveau message aux messages "
-"prédéfinis."
-
-#: C/set-custom-status.page:156(p)
-msgid "When finished, click on <gui>Close</gui>."
-msgstr "Cliquez sur <gui>Fermer</gui> quand vous avez terminé."
-
-#: C/set-custom-status.page:163(p)
-msgid ""
-"When you edit or add a new custom message, it will not be set as the current "
-"status message. You will need to select it from the <gui>Contact List</gui> "
-"window."
-msgstr ""
-"Quand vous modifiez ou créez un message personnalisé, il ne devient pas le "
-"message du statut en cours. Vous devez le sélectionner dans la fenêtre "
-"<gui>Liste des contacts</gui>."
-
-#: C/send-message.page:8(desc)
-msgid "Send a message to one of your contacts."
-msgstr "Envoyer un message à l'un de vos contacts."
-
-#: C/send-message.page:17(name) C/send-file.page:17(name)
-#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:15(name)
-#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:15(name)
-#: C/change-status.page:24(name) C/add-contact.page:18(name)
-msgid "Phil Bull"
-msgstr "Phil Bull"
-
-#: C/send-message.page:18(email) C/send-file.page:18(email)
-#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:16(email)
-#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:16(email)
-#: C/change-status.page:25(email) C/add-contact.page:19(email)
-msgid "philbull@gmail.com"
-msgstr "philbull@gmail.com"
-
-#: C/send-message.page:32(title)
-msgid "Send a message to someone"
-msgstr "Envoi d'un message à quelqu'un"
-
-#: C/send-message.page:36(p)
-msgid ""
-"From the <gui>Contact List</gui> window, double-click the name of the "
-"contact that you want to have a conversation with."
-msgstr ""
-"Dans la fenêtre <gui>Liste des contacts</gui>, double-cliquez sur le nom du "
-"contact avec lequel vous voulez discuter."
-
-#: C/send-message.page:42(p)
-msgid ""
-"A new window will open. Type a message into the box at the bottom of the "
-"window and press <key>Enter</key> to send it."
-msgstr ""
-"Une nouvelle fenêtre s'ouvre. Saisissez votre message dans la zone de texte "
-"en bas de la fenêtre et appuyez sur <key>Entrée</key> pour l'envoyer."
-
-#: C/send-message.page:50(title)
-msgid "Send a message to a meta-contact"
-msgstr "Envoi d'un message à un méta-contact"
-
-#: C/send-message.page:58(p)
-msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Chat</gui>."
-msgstr ""
-"Sélectionnez le contact avec lequel vous voulez discuter et choisissez <gui "
-"style=\"menuitem\">Discuter</gui> dans le menu."
-
-#: C/send-file.page:8(desc)
-msgid "Send a file from your computer to one of your contacts."
-msgstr "Envoyer un fichier de votre ordinateur à l'un de vos contacts."
-
-#: C/send-file.page:36(title)
-msgid "Send files"
-msgstr "Envoi de fichiers"
-
-#: C/send-file.page:40(p) C/favorite-rooms.page:66(p)
-msgid "From the <gui>Contact List</gui> window, perform one of the following:"
-msgstr ""
-"À partir de la fenêtre <gui>Liste des contacts</gui>, effectuez une des "
-"actions suivantes :"
-
-#: C/send-file.page:45(p)
-msgid ""
-"Right click on the contact you want to send a file to, and choose <gui>Send "
-"file</gui>."
-msgstr ""
-"Cliquez droit sur le nom du contact auquel vous voulez envoyer un fichier et "
-"sélectionnez <gui>Envoyer un fichier</gui>."
-
-#: C/send-file.page:50(p)
-msgid ""
-"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
-"gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
-msgstr ""
-"Cliquez sur le contact auquel vous voulez envoyer un fichier et sélectionnez "
-"<guiseq><gui>Édition</gui><gui>Contact</gui><gui>Envoyer un fichier</gui></"
-"guiseq>."
-
-#: C/send-file.page:58(p)
-msgid "Select the file to send, and click on <gui>Send</gui>."
-msgstr "Sélectionnez le fichier à envoyer et cliquez sur <gui>Envoyer</gui>."
-
-#: C/send-file.page:63(p)
-msgid "The <gui>File Transfers</gui> window will appear."
-msgstr "La fenêtre <gui>Transferts de fichiers</gui> apparaît."
-
-#: C/send-file.page:66(p)
-msgid ""
-"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
-"to halt the transfer."
-msgstr ""
-"Attendez que votre contact accepte le transfert de fichier ou cliquez sur "
-"<gui>Arrêter</gui> pour arrêter le transfert."
-
-#: C/send-file.page:72(p)
-msgid ""
-"Once the transfer is finished, it is possible to close the <gui>File "
-"Transfers</gui> window."
-msgstr ""
-"À la fin du transfert, vous pouvez fermer la fenêtre <gui>Transferts de "
-"fichiers</gui>."
-
-#: C/send-file.page:80(p)
-msgid ""
-"If you have multiple finished transfers listed in the window, click on "
-"<gui>Clear</gui> to empty the list. This will only remove the files from the "
-"list and will not delete them from your computer."
-msgstr ""
-"Si plusieurs transferts apparaissent dans la fenêtre, vous pouvez les "
-"supprimer en cliquant sur <gui>Effacer</gui>. Les fichiers disparaîtront de "
-"la liste mais ne seront pas supprimés de votre ordinateur."
-
-#: C/send-file.page:87(p)
-msgid ""
-"It is possible to send files only using the following services: <em>Jabber</"
-"em>, <em>Google Talk</em> and <em>People Nearby</em>."
-msgstr ""
-"Le transfert de fichier n'est possible qu'avec les services suivants : "
-"<em>Jabber</em>, <em>Google Talk</em> et <em>Personnes à proximité</em>."
-
-#: C/send-file.page:93(p)
-msgid ""
-"In order to send a file to someone, you need to be connected to the "
-"Internet, or to a local area network."
-msgstr ""
-"Vous devez être connecté sur internet ou au réseau local pour pouvoir "
-"envoyer des fichiers à quelqu'un."
-
-#: C/salut-protocol.page:8(desc)
-msgid "Understanding the People Nearby feature."
-msgstr "Comprendre la fonctionnalité « Personnes à proximité »."
-
-#: C/salut-protocol.page:33(title)
-msgid "What is People Nearby?"
-msgstr "Fonctionnalité « Personnes à proximité » ?"
-
-#: C/salut-protocol.page:37(p)
-msgid "I'd like to see this played up a bit more."
-msgstr "J'aimerais bien que cela soit plus souvent utilisé."
-
-#: C/salut-protocol.page:40(p)
-msgid ""
-"The People Nearby service is a serverless communication service: you do not "
-"need to connect and authenticate to a central server in order to use it."
-msgstr ""
-"Le service « Personnes à proximité » est un service de communication sans "
-"serveur : il n'est pas nécessaire de se connecter et de s'identifier à un "
-"serveur central pour l'utiliser."
-
-#: C/salut-protocol.page:45(p)
-msgid ""
-"This kind of serverless messaging system is restricted to a local area "
-"network and an active Internet connection is not necessary."
-msgstr ""
-"Ce type de système de messagerie sans serveur est limité aux réseaux locaux "
-"et l'activation d'une connexion à internet n'est pas nécessaire."
-
-#: C/salut-protocol.page:49(p)
-msgid ""
-"The people that use this service inside the same local area network will be "
-"auto-discovered, and it will be possible to send them messages and files as "
-"with other services."
-msgstr ""
-"Les personnes qui utilisent ce service à l'intérieur du même réseau local "
-"sont auto-identifiées et il est possible de leur envoyer des messages et des "
-"fichiers comme avec les autres services."
-
-#: C/salut-protocol.page:54(p)
-msgid ""
-"All the modern local area networks should be able to support this kind of "
-"service."
-msgstr ""
-"Tous les réseaux locaux récents devraient être capable de prendre en charge "
-"ce type de service."
-
-#: C/remove-account.page:8(desc)
-msgid "Completely remove an account from <app>Empathy</app>."
-msgstr "Supprimer complètement un compte dans <app>Empathy</app>."
-
-#: C/remove-account.page:34(title)
-msgid "Remove an account"
-msgstr "Suppression d'un compte"
-
-#: C/remove-account.page:36(p)
-msgid ""
-"You can completely remove an account from <app>Empathy</app> if you no "
-"longer wish to use the account. If you wish to use the account in "
-"<app>Empathy</app> again in the future, you will have to add your account "
-"details again."
-msgstr ""
-"Vous pouvez supprimer un compte définitivement d'<app>Empathy</app> si vous "
-"ne souhaitez plus l'utiliser. Si vous souhaitez réutiliser ce compte dans "
-"<app>Empathy</app>, il faudra le créer de nouveau avec tous ses paramètres."
-
-#: C/remove-account.page:43(p) C/irc-nick-password.page:50(p)
-#: C/disable-account.page:49(p) C/add-account.page:49(p)
-msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
-"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
-msgstr ""
-"À partir de la fenêtre <gui>Liste des contacts</gui>, sélectionnez "
-"<guiseq><gui>Édition</gui><gui>Comptes</gui></guiseq>, ou appuyez sur "
-"<key>F4</key>."
-
-#: C/remove-account.page:47(p)
-msgid ""
-"Select the account you wish to remove from the accounts list on the left "
-"side of the window."
-msgstr ""
-"Sélectionnez le compte que vous voulez supprimer dans la liste de comptes de "
-"la partie gauche de la fenêtre."
-
-#: C/remove-account.page:51(p)
-msgid "Click <gui style=\"button\">-</gui>."
-msgstr "Cliquez sur le bouton <gui style=\"button\">-</gui>."
-
-#: C/remove-account.page:54(p)
-msgid ""
-"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
-"button to permanently remove the account."
-msgstr ""
-"Une boite de dialogue s'ouvre pour vous demander de confirmer la "
-"suppression. Cliquez sur <gui>Supprimer</gui> pour supprimer le compte "
-"définitivement."
-
-#: C/remove-account.page:60(p)
-msgid ""
-"Even after removing an account, <app>Empathy</app> does not delete your "
-"conversation history for that account."
-msgstr ""
-"Même après la suppression d'un compte, <app>Empathy</app> ne supprime pas "
-"l'historique de ses conversations."
-
-#: C/prob-conn.page:7(desc)
-msgid "Diagnose common problems connecting to an instant messaging service."
-msgstr ""
-"Diagnostique des problèmes courants de connexion à un service de messagerie "
-"instantanée."
-
-#: C/prob-conn.page:29(title)
-msgid "Problems connecting to an instant messaging service"
-msgstr "Problèmes de connexion à un service de messagerie instantanée"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/prob-conn-neterror.page:59(None) C/prob-conn-name.page:44(None)
-#: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None)
-msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
-msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
-
-#: C/prob-conn-neterror.page:7(desc)
-msgid ""
-"An error message which says “<gui>Network error</gui>� appears in the main "
-"window."
-msgstr ""
-"Un message d'erreur indiquant « <gui>Erreur réseau</gui> » apparaît dans la "
-"fenêtre principale."
-
-#: C/prob-conn-neterror.page:34(title)
-msgid "I get a message that says “Network error�"
-msgstr "J'obtiens le message « Erreur réseau »"
-
-#: C/prob-conn-neterror.page:37(cite)
-msgid "shaunm"
-msgstr "shaunm"
-
-#: C/prob-conn-neterror.page:38(p)
-msgid ""
-"Empathy no longer allows you to create an IRC account without a valid nick. "
-"I've removed the guide link. Remove the text."
-msgstr ""
-"Empathy ne vous autorise plus à créer un compte IRC sans pseudo valide. J'ai "
-"supprimé le lien du guide et supprimé le texte."
-
-#: C/prob-conn-neterror.page:42(p)
+#: C/index.page:22(info/desc)
 msgid ""
-"This kind of error happens when <app>Empathy</app> cannot communicate with "
-"the instant messaging service for some reason."
+"Cheese lets you take pictures and make videos using your webcam. You can "
+"even add special effects!"
 msgstr ""
-"Ce type d'erreur se produit quand <app>Empathy</app> ne parvient pas à "
-"communiquer avec le service de messagerie instantanée."
+"Cheese permet de prendre des photos et des vidéos en utilisant votre webcam. "
+"Vous pouvez même ajouter des effets spéciaux !"
 
-#: C/prob-conn-neterror.page:46(p)
+#: C/index.page:25(page/title)
 msgid ""
-"Also, this kind of error happens when you try to use an IRC account without "
-"setting a nickname."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/cheese.png\" width="
+"\"40\" height=\"40\"> </media> Cheese Webcam Booth"
 msgstr ""
-"Ce type d'erreur se produit aussi quand vous essayez d'utiliser un compte "
-"IRC sans paramétrer de pseudonyme."
-
-#: C/prob-conn-neterror.page:53(p) C/prob-conn-auth.page:45(p)
-#: C/prob-conn-acctdisabled.page:44(p)
-msgid ""
-"Make sure that you are connected to the Internet, or to a local area network."
-msgstr "Assurez-vous d'être connecté à internet ou au réseau local."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/cheese.png\" width="
+"\"40\" height=\"40\"> </media> Studio webcam Cheese"
 
-#: C/prob-conn-neterror.page:58(p) C/prob-conn-name.page:43(p)
-#: C/prob-conn-auth.page:57(p)
-msgid ""
-"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
-"\">edit</media> icon in the error message."
-msgstr ""
-"Cliquez sur l'icône <media type=\"image\" mime=\"image/png\" src=\"figures/"
-"gtk-edit.png\">Modifier</media> dans le message d'erreur."
-
-#: C/prob-conn-neterror.page:64(p) C/prob-conn-acctdisabled.page:60(p)
-msgid ""
-"Check in the <gui>Advanced</gui> section that all the details are correct. "
-"You should be able to find these details from the website of the messaging "
-"service."
-msgstr ""
-"Vérifiez dans la section <gui>Avancé</gui> si tous les paramètres sont "
-"corrects.Vous devriez trouver ces paramètres sur le site internet de votre "
-"service de messagerie."
+#: C/index.page:32(section/title)
+msgid "Main features"
+msgstr "Principales fonctionnalités"
 
-#: C/prob-conn-neterror.page:79(p) C/prob-conn-name.page:65(p)
-msgid ""
-"Switch the account off, and then switch it on to try to reconnect to the "
-"service."
-msgstr ""
-"Désactivez le compte, puis activez-le pour essayer de vous reconnecter au "
-"service."
+#: C/index.page:36(section/title)
+msgid "Preferences"
+msgstr "Préférences"
 
-#: C/prob-conn-neterror.page:87(title)
-msgid "Proxy support"
-msgstr "Prise en charge d'un service mandataire"
+#: C/index.page:40(section/title)
+msgid "Common problems and questions"
+msgstr "Problèmes et questions fréquents"
 
-#: C/prob-conn-neterror.page:88(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/effects-apply.page:45(media)
+msgctxt "_"
 msgid ""
-"At the moment <app>Empathy</app> can not be configured to work with a proxy."
+"external ref='figures/effects.png' md5='27139b3d1500c8caac548fab39e05c28'"
 msgstr ""
-"Pour l'instant, <app>Empathy</app> ne peut pas être configuré pour "
-"fonctionner avec un service mandataire."
-
-#: C/prob-conn-name.page:9(title)
-msgid "“Name in use�"
-msgstr "« Nom déjà utilisé »"
+"external ref='figures/effects.png' md5='27139b3d1500c8caac548fab39e05c28'"
 
-#: C/prob-conn-name.page:10(desc)
+#: C/effects-apply.page:18(info/desc)
 msgid ""
-"An error message which says “<gui>Name in use</gui>� appears in the main "
-"window."
+"Add fun effects to your photos and videos, like turning yourself green or "
+"distorting the picture like a funhouse mirror."
 msgstr ""
-"Un message d'erreur indiquant « <gui>Nom déjà utilisé</gui> » apparaît dans "
-"la fenêtre principale."
+"Ajouter des effets amusants à vos photos et vidéos, comme devenir tout vert "
+"ou distordre l'image comme dans un miroir déformant."
 
-#: C/prob-conn-name.page:33(title)
-msgid "I get a message that says “Name in use�"
-msgstr "J'obtiens le message « Nom déjà utilisé »"
+#: C/effects-apply.page:22(page/title)
+msgid "Apply effects to photos and videos"
+msgstr "Ajout d'effets aux photos et aux vidéos"
 
-#: C/prob-conn-name.page:35(p)
-msgid ""
-"This kind of error happens when you try to connect to your IRC account and "
-"you are using a nickname that is already being used by someone else on that "
-"particular network."
-msgstr ""
-"Ce type d'erreur se produit si vous tentez de vous connecter avec un compte "
-"IRC et que vous utilisez un pseudonyme qui est déjà utilisé par quelqu'un "
-"sur ce réseau."
+#: C/effects-apply.page:24(page/p)
+msgid "You can apply fun, interesting effects to your photos and videos:"
+msgstr "Vous pouvez appliquer des effets amusants à vos photos et vos vidéos :"
 
-#: C/prob-conn-name.page:51(p)
-msgid "In the <gui>Nickname</gui> text box, type a new nickname."
-msgstr ""
-"Dans la zone de texte <gui>Pseudonyme</gui>, saisissez un nouveau pseudonyme."
+#: C/effects-apply.page:26(item/p)
+msgid "Click <gui>Effects</gui>."
+msgstr "Cliquez sur <gui>Effets</gui>."
 
-#: C/prob-conn-name.page:56(p)
-msgid ""
-"If you have registered that nickname within the network you are using, set "
-"the password for that nickname. For more information, see <link xref=\"irc-"
-"nick-password\"/>."
-msgstr ""
-"Si vous avez enregistré ce pseudonyme sur le réseau utilisé, saisissez le "
-"mot de passe pour ce pseudonyme. Pour plus d'informations, consultez <link "
-"xref=\"irc-nick-password\"/>."
+#: C/effects-apply.page:28(item/p)
+msgid "Select the effect you want to use by clicking one of the options."
+msgstr "Sélectionnez les effets souhaités en cliquant sur une des options."
 
-# traduction du message d'erreur
-#: C/prob-conn-auth.page:8(desc)
+#: C/effects-apply.page:29(item/p)
 msgid ""
-"An error message which says “<gui>Authentication failed</gui>� appears in "
-"the main window."
+"If you like, you can select multiple effects. For example, if you select "
+"<gui>Hulk</gui> and <gui>Kung-Fu</gui>, the video will be altered to have a "
+"green shade and will show a repeated image."
 msgstr ""
-"Un message d'erreur indiquant « <gui>L'authentification a échoué</gui> » "
-"apparaît dans la fenêtre principale."
-
-#: C/prob-conn-auth.page:36(title)
-msgid "I get a message that says “Authentication failed�"
-msgstr "J'obtiens le message « L'authentification a échoué »"
+"Si vous le souhaitez, vous pouvez sélectionner plusieurs effets. Par "
+"exemple, si vous sélectionnez <gui>Hulk</gui> et <gui>Kung-Fu</gui>, la "
+"vidéo va être transformée pour avoir un ton vert et afficher une image "
+"répétée."
 
-#: C/prob-conn-auth.page:38(p)
+#: C/effects-apply.page:34(item/p)
 msgid ""
-"This kind of error happens when your instant messaging service is not "
-"allowing you to connect because it does not recognize your username or "
-"password for some reason."
+"Click <gui>Effects</gui> to hide the effects menu and return to the normal "
+"view."
 msgstr ""
-"Ce type d'erreur se produit quand votre service de messagerie instantanée ne "
-"vous permet pas de vous connecter parce qu'il ne reconnaît pas votre nom "
-"d'utilisateur ou votre mot de passe."
+"Cliquez sur <gui>Effets</gui> pour cacher le menu des effets et revenir à la "
+"vue normale."
 
-#: C/prob-conn-auth.page:50(p)
+#: C/effects-apply.page:39(page/p)
 msgid ""
-"Make sure that you have registered an account with the service you are "
-"trying to connect to. If you do not have an account, most services will not "
-"allow you to connect."
+"<app>Cheese</app> offers 34 effects, of which only 9 are shown on the first "
+"page. Click <gui>Next Effects</gui> and <gui>Previous Effects</gui> to "
+"navigate to the other pages."
 msgstr ""
-"Vérifiez que vous êtes inscrit au service auquel vous essayez de vous "
-"connecter. Si vous n'avez pas de compte enregistré, la plupart des services "
-"vous refusent la connexion."
+"<app>Cheese</app> fournit 34 effets. Seuls 9 d'entre eux sont affichés sur "
+"la première page. Cliquez sur <gui>Effets suivants</gui> ou <gui>Effets "
+"précédents</gui> pour naviguer parmi les autres pages."
 
-#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:55(p)
-msgid ""
-"Type your username and password again to make sure that they are correct."
-msgstr ""
-"Saisissez votre nom d'utilisateur et votre mot de passe afin de vous assurer "
-"qu'ils sont corrects."
+#: C/effects-apply.page:44(figure/title)
+msgid "Some of the effects, from left to right: Bulge, Edge and Mirror"
+msgstr "Quelques effets, de gauche à droite : boursouflure, contours et miroir"
 
-#: C/prob-conn-auth.page:68(p)
+#: C/effects-apply.page:48(note/p)
 msgid ""
-"Deselect the <gui>Enabled</gui>, and then select it again to try to "
-"reconnect to the service."
-msgstr ""
-"Décochez la case à cocher <gui>Activé</gui> et cochez-la de nouveau pour "
-"essayer de vous reconnecter au service."
-
-#: C/prob-conn-acctdisabled.page:7(desc)
-msgid ""
-"The instant messaging account that you want to use is not enabled in the "
-"list of accounts."
-msgstr ""
-"Le compte que vous voulez utiliser n'est pas activé dans la liste des "
-"comptes."
-
-#: C/prob-conn-acctdisabled.page:34(title)
-msgid "My account is not enabled"
-msgstr "Mon compte n'est pas activé"
-
-#: C/prob-conn-acctdisabled.page:36(p)
-msgid ""
-"If the instant messaging account that you want to use is not enabled in the "
-"drop-down account list when you try to start a new conversation or join a "
-"room, your account details may not be correct."
-msgstr ""
-"Si vous essayez de commencer une nouvelle conversation, ou de rejoindre un "
-"groupe de discussion, et que le compte que vous souhaitez utiliser n'est pas "
-"actif dans la liste déroulante, les détails de ce compte sont probablement "
-"incorrects."
-
-#: C/prob-conn-acctdisabled.page:49(p)
-msgid ""
-"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
-"account that is not working."
-msgstr ""
-"Sélectionnez <guiseq><gui>Édition</gui><gui>Comptes</gui></guiseq> et "
-"sélectionnez le compte qui ne fonctionne pas."
-
-#: C/prob-conn-acctdisabled.page:66(p)
-msgid "Check that the account is switched on."
-msgstr "Vérifiez que le compte est activé."
-
-#: C/prev-conv.page:8(desc)
-msgid "Browse or search your previous conversations."
-msgstr "Parcourir ou faire une recherche parmi vos conversations précédentes."
-
-#: C/prev-conv.page:36(title)
-msgid "View previous conversations"
-msgstr "Affichage des conversations précédentes"
-
-#: C/prev-conv.page:38(p)
-msgid ""
-"<app>Empathy</app> automatically saves all your text conversations you have "
-"with your contacts. You can <link xref=\"#search\">search through all of "
-"your previous conversations</link> or <link xref=\"#browse\">browse previous "
-"conversations</link> by contact and date."
-msgstr ""
-"<app>Empathy</app> enregistre automatiquement toutes les conversations "
-"textuelles que vous avez eu avec vos contacts. Vous pouvez <link xref="
-"\"#search\">Rechercher parmi toutes vos conversations précédentes</link> ou "
-"<link xref=\"#browse\">Parcourir les conversations précédentes</link> par "
-"contact ou par date."
-
-#: C/prev-conv.page:46(p)
-msgid ""
-"You do not need to be connected to the Internet to view and search your "
-"previous conversations."
-msgstr ""
-"Vous n'avez pas besoin d'être connecté à internet pour consulter ou faire "
-"des recherches dans vos anciennes conversations."
-
-#: C/prev-conv.page:53(title)
-msgid "Search previous conversations"
-msgstr "Recherche de conversations précédentes"
-
-#: C/prev-conv.page:55(p)
-msgid ""
-"You can perform a full-text search through all of your previous "
-"conversations."
-msgstr ""
-"Vous pouvez faire une recherche de texte intégral à travers toutes vos "
-"conversations précédentes."
-
-#: C/prev-conv.page:59(p) C/prev-conv.page:87(p)
-msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
-"<key>F3</key>."
-msgstr ""
-"À partir de la fenêtre <gui>Liste des contacts</gui>, sélectionnez "
-"<guiseq><gui>Affichage</gui><gui>Conversations précédentes</gui></guiseq>. "
-"Vous pouvez aussi appuyer sur <key>F3</key>."
-
-#: C/prev-conv.page:63(p)
-msgid ""
-"Select an account from the drop-down list in the top. A list of contacts and "
-"chat room for that account will be shown below."
-msgstr ""
-"Sélectionnez un compte dans la liste déroulante en haut. Une liste de "
-"contacts et de salons de discussion apparaît en dessous."
-
-#: C/prev-conv.page:67(p)
-msgid ""
-"Type the text you want to search for in the <gui>Search</gui> text field."
-msgstr ""
-"Saisissez le texte que vous recherchez dans le champ de texte "
-"<gui>Rechercher</gui>."
-
-#: C/prev-conv.page:71(p)
-msgid ""
-"Any conversations that matched your search terms will be shown. By default, "
-"conversations are ordered by date."
-msgstr ""
-"Toutes les conversations correspondant aux termes que vous avez saisis "
-"apparaissent. Par défaut, les conversations sont classées par date."
-
-#: C/prev-conv.page:80(title)
-msgid "Browse previous conversations"
-msgstr "Parcours de conversations précédentes"
-
-#: C/prev-conv.page:82(p)
-msgid ""
-"You can browse your previous conversations with your contacts or in chat "
-"rooms by date."
-msgstr ""
-"Vous pouvez parcourir vos précédentes conversations avec vos contacts ou "
-"dans des salons de discussion, classées par date."
-
-#: C/prev-conv.page:91(p)
-msgid ""
-"Select an account from the drop-down list in the top left. A list of "
-"contacts and chat room for that account will be shown below."
-msgstr ""
-"Sélectionnez un compte dans la liste déroulante en haut à gauche. Une liste "
-"de contacts et de salons de discussion apparaît en dessous."
-
-#: C/prev-conv.page:95(p)
-msgid ""
-"Select a contact or chat room to view your previous conversations from. By "
-"default the most recent conversation will be shown."
-msgstr ""
-"Sélectionnez le contact ou le salon de discussion pour consulter "
-"l'historique des conversations. Par défaut la conversation la plus récente "
-"est affichée."
-
-#: C/prev-conv.page:99(p)
-msgid ""
-"You can browse your conversations by date. Days on which you had a "
-"conversation with the selected contact will be shown in bold text. Click a "
-"date to select it. Click the arrows next to the month and year to browse "
-"earlier dates."
-msgstr ""
-"Vous pouvez parcourir vos conversations par date. Vous verrez apparaître en "
-"gras les jours pour lesquels vous avez eu une conversation avec le contact "
-"sélectionné. Cliquez sur un jour pour le sélectionner et sur les flèches à "
-"côté du mois et de l'année pour parcourir des dates plus anciennes."
-
-#: C/prev-conv.page:105(p)
-msgid ""
-"You can search for text in the conversations by typing into the search field "
-"at the top. The matching conversations will be showed."
-msgstr ""
-"Vous pouvez rechercher du texte dans les conversations en le saisissant dans "
-"la zone de saisie en haut. Les conversations correspondantes sont affichées."
-
-#: C/prev-conv.page:111(p)
-msgid ""
-"You can quickly view the previous conversations with one of your contacts "
-"from the <gui>Contact List</gui> window. Simply right click the contact and "
-"choose <gui>Previous Conversations</gui>. The <gui>Previous Conversations</"
-"gui> window will open with that contact already selected."
-msgstr ""
-"Vous pouvez rapidement afficher vos conversations précédentes avec un de vos "
-"contacts à partir de la fenêtre <gui>Liste des contacts</gui>. Faites tout "
-"simplement un clic droit sur le contact et choisissez <gui>Afficher les "
-"conversations précédentes</gui>. La fenêtre <gui>Conversations précédentes</"
-"gui> s'ouvre directement sur le contact sélectionné."
-
-#: C/link-contacts.page:11(desc)
-msgid "Merge and separate different contacts into a single one."
-msgstr "Fusionner et séparer différents contacts en un seul."
-
-#: C/link-contacts.page:25(title)
-msgid "Combine and separate contacts"
-msgstr "Fusion et séparation de contacts"
-
-#: C/link-contacts.page:26(p)
-msgid ""
-"If one, or more, of your contacts has multiple accounts with different "
-"messaging services, you can combine these contacts into a single one."
-msgstr ""
-"Si un ou plusieurs de vos contacts possèdent de nombreux comptes avec "
-"différents services de messagerie, vous pouvez fusionner ces contacts en un "
-"seul."
-
-#: C/link-contacts.page:30(p)
-msgid ""
-"The resulting contact is called a <em>meta-contact</em>: a contact composed "
-"from different single contacts."
-msgstr ""
-"Le contact résultant est appelé un <em>méta-contact</em> : un contact "
-"composé de différents contacts uniques."
-
-#: C/link-contacts.page:34(p)
-msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
-msgstr ""
-"Si vous avez un contact appelée Jane Smith qui utilise trois différents "
-"services de messagerie comme :"
-
-#: C/link-contacts.page:40(p)
-msgid "janes@facebook"
-msgstr "janes@facebook"
-
-#: C/link-contacts.page:45(p)
-msgid "jane.smith@gmail"
-msgstr "jane.smith@gmail"
-
-#: C/link-contacts.page:50(p)
-msgid "jane_smith@hotmail"
-msgstr "jane_smith@hotmail"
-
-#: C/link-contacts.page:55(p)
-msgid "You can combine these contacts into a single Jane Smith one."
-msgstr "vous pouvez associer ces contacts dans une unique Jane Smith."
-
-#: C/link-contacts.page:60(title)
-msgid "Combining contacts"
-msgstr "Association de contacts"
-
-#: C/link-contacts.page:63(p)
-msgid ""
-"From the <gui>Contact List</gui> window, right-click one of the contact that "
-"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
+"To deselect all effects, click <gui>Effects</gui> and select <gui>No Effect</"
 "gui>."
 msgstr ""
-"Dans la fenêtre <gui>Liste des contacts</gui>, faites un clic droit sur l'un "
-"des contacts qui possède plusieurs comptes et sélectionnez <gui style="
-"\"menuitem\">Lier des contacts...</gui>."
-
-#: C/link-contacts.page:70(p)
-msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
-msgstr ""
-"Dans le panneau de gauche de la fenêtre <gui>Lier des contacts</gui>, "
-"sélectionnez les contacts que vous voulez associer."
-
-#: C/link-contacts.page:76(p)
-msgid "Click <gui style=\"button\">Link</gui>."
-msgstr "Cliquez sur <gui style=\"button\">Lier</gui>."
-
-#: C/link-contacts.page:82(p)
-msgid ""
-"When a meta-contact has been created, the default contact that will be used "
-"to have a conversation with when you double-click on it, is the contact with "
-"the highest presence on-line."
-msgstr ""
-"Quand un méta-contact a été créé, le contact par défaut qui sera utilisé "
-"comme interlocuteur lors d'un double-clic, est le contact qui est le plus "
-"souvent présent en-ligne."
-
-#: C/link-contacts.page:91(title)
-msgid "Separating contacts"
-msgstr "Séparation de contacts"
-
-#: C/link-contacts.page:94(p)
-msgid ""
-"From the <gui>Contact List</gui>, right-click the contact to separate, and "
-"select <gui style=\"menuitem\">Link Contacts...</gui>."
-msgstr ""
-"Dans la fenêtre <gui>Liste des contacts</gui>, faites un clic droit sur le "
-"contact à séparer et sélectionnez <gui style=\"menuitem\">Lier des "
-"contacts...</gui>."
-
-#: C/link-contacts.page:100(p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "Cliquez sur <gui style=\"button\">Séparer</gui>."
-
-#: C/license.page:8(desc)
-msgid "Legal information."
-msgstr "Informations légales."
-
-#: C/license.page:11(title)
-msgid "License"
-msgstr "Licence"
-
-#: C/license.page:12(p)
-msgid ""
-"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
-"Unported license."
-msgstr ""
-"Cette œuvre est distribuée sous licence Creative Commons Paternité-Partage "
-"des Conditions Initiales à l'Identique 3.0 Unported."
-
-#: C/license.page:20(p)
-msgid "You are free:"
-msgstr "Vous êtes libre :"
-
-#: C/license.page:25(em)
-msgid "To share"
-msgstr "de partager"
-
-#: C/license.page:26(p)
-msgid "To copy, distribute and transmit the work."
-msgstr "de reproduire, distribuer et communiquer cette création,"
-
-#: C/license.page:29(em)
-msgid "To remix"
-msgstr "de modifier"
-
-#: C/license.page:30(p)
-msgid "To adapt the work."
-msgstr "d'adapter cette création."
-
-#: C/license.page:33(p)
-msgid "Under the following conditions:"
-msgstr "selon les conditions suivantes :"
-
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "Paternité"
-
-#: C/license.page:39(p)
-msgid ""
-"You must attribute the work in the manner specified by the author or "
-"licensor (but not in any way that suggests that they endorse you or your use "
-"of the work)."
-msgstr ""
-"Vous devez citer le nom de l'auteur original de la manière indiquée par "
-"l'auteur de l'œuvre ou le titulaire des droits qui vous confère cette "
-"autorisation (mais pas d'une manière qui suggérerait qu'ils vous soutiennent "
-"ou approuvent votre utilisation de l'Å“uvre)."
-
-#: C/license.page:46(em)
-msgid "Share Alike"
-msgstr "Partage des conditions initiales à l'identique"
-
-#: C/license.page:47(p)
-msgid ""
-"If you alter, transform, or build upon this work, you may distribute the "
-"resulting work only under the same, similar or a compatible license."
-msgstr ""
-"Si vous modifiez, transformez ou adaptez cette création, vous n'avez le "
-"droit de distribuer la création qui en résulte que sous un contrat identique "
-"à celui-ci."
-
-#: C/license.page:53(p)
-msgid ""
-"For the full text of the license, see the <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
-"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">Commons Deed</link>."
-msgstr ""
-"Pour prendre connaissance du texte complet de la licence, consultez le <link "
-"href=\"http://creativecommons.org/licenses/by-sa/3.0/legalcode\">site Web "
-"CreativeCommons</link> ou lisez in extenso le <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/\">contrat Commons</link>."
-
-#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation with an IRC contact."
-msgstr "Démarrer une conversation avec un contact IRC."
-
-#: C/irc-start-conversation.page:30(title)
-msgid "Chat with somebody on IRC"
-msgstr "Discussion avec quelqu'un sur IRC"
-
-#: C/irc-start-conversation.page:32(p)
-msgid ""
-"You can hold private conversations with other IRC users, outside of the "
-"public IRC chat rooms. To start a conversation with another IRC user:"
-msgstr ""
-"Vous pouvez entretenir une conversation privée avec d'autres utilisateurs "
-"IRC en dehors du salon de discussion IRC public. Pour démarrer une "
-"conversation avec un autre utilisateur :"
-
-#: C/irc-start-conversation.page:37(p)
-msgid ""
-"In the contact list for an IRC chat room, double click the name of the user "
-"you want to chat with. Alternatively, right click the name of the user and "
-"choose <gui>Chat</gui>."
-msgstr ""
-"Dans la liste des contacts des salons de discussion IRC, double-cliquez sur "
-"le nom de l'utilisateur avec qui vous souhaitez discuter. Vous pouvez "
-"également faire un clic droit sur le nom de l'utilisateur et choisir "
-"<gui>Discuter</gui>."
-
-#: C/irc-start-conversation.page:45(p)
-msgid ""
-"The IRC room contact list is not the same as <app>Empathy</app> contact "
-"list. It contains a list of users in the IRC chat room you joined. Different "
-"rooms can have different contacts listed."
-msgstr ""
-"La liste des contacts des salons de discussion IRC n'est pas la même que la "
-"liste des contacts d'<app>Empathy</app>. Elle contient une liste des "
-"utilisateurs dans le salon de discussion IRC que vous avez rejoint."
-
-#: C/irc-start-conversation.page:52(p)
-msgid ""
-"The IRC room contact list is usually on the right side of the IRC room "
-"window. If you do not see it, choose <guiseq><gui>Conversation</"
-"gui><gui>Show Contact List</gui></guiseq>."
-msgstr ""
-"La liste des contacts des salons de discussion IRC est située sur le côté "
-"droit de la fenêtre du salon IRC. Si vous ne la voyez pas, choisissez "
-"<guiseq><gui>Conversation</gui><gui>Afficher la liste des contacts</gui></"
-"guiseq>."
-
-#: C/irc-send-file.page:9(desc)
-msgid "<app>Empathy</app> does not currently support sending files using IRC."
-msgstr ""
-"<app>Empathy</app> ne prend pas actuellement en charge l'envoi de fichiers "
-"en utilisant IRC."
-
-#: C/irc-send-file.page:31(title)
-msgid "Send files over IRC"
-msgstr "Envoi de fichiers sur IRC"
-
-#: C/irc-send-file.page:33(p)
-msgid "It is not currently possible to send files using IRC."
-msgstr ""
-"Il n'est actuellement pas possible d'envoyer des fichiers en utilisant IRC."
-
-#: C/irc-nick-password.page:10(desc)
-msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr ""
-"Protéger votre pseudonyme pour empêcher son utilisation par d'autres "
-"utilisateurs IRC."
+"Pour enlever tous les effets, cliquez sur <gui>Effets</gui> et sélectionnez "
+"<gui>Aucun effet</gui>."
 
-#: C/irc-nick-password.page:33(title)
-msgid "Use a nickname password on IRC"
-msgstr "Utilisation d'un mot de passe pour pseudonyme sur IRC"
+#: C/introduction.page:20(info/desc)
+msgid "Introduction to the <app>Cheese Webcam Booth</app>."
+msgstr "Introduction au <app>Studio webcam Cheese</app>."
 
-#: C/irc-nick-password.page:35(p)
-msgid ""
-"On some IRC networks, you can register your nickname with a service called "
-"NickServ. By sending special messages to NickServ, you can set your password "
-"and identify yourself. Some IRC chat rooms may not allow you to join without "
-"a registered nickname."
-msgstr ""
-"Sur certains réseaux IRC, vous pouvez inscrire votre pseudonyme à un service "
-"appelé NickServ. En envoyant des messages particuliers à NickServ, vous "
-"pouvez définir votre mot de passe et vous identifier. Certains salons de "
-"discussion interdisent leur accès si votre pseudonyme n'est pas inscrit."
-
-#: C/irc-nick-password.page:40(p)
-msgid ""
-"<app>Empathy</app> does not currently support nickname registration. Some "
-"IRC networks, however, will automatically forward a <em>server password</em> "
-"to NickServ. On these networks, you can use the IRC password in "
-"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
-"network is known to have this feature."
-msgstr ""
-"<app>Empathy</app> ne prend pas en charge actuellement l'inscription des "
-"pseudonymes. Cependant, certains réseaux IRC vont faire suivre "
-"automatiquement un <em>mot de passe serveur</em> à NickServ. Sur ces "
-"réseaux, vous pouvez utiliser le mot de passe IRC dans <app>Empathy</app> "
-"pour vous identifier à NickServ. Le célèbre réseau freeNode est connu pour "
-"avoir cette fonctionnalité."
-
-#: C/irc-nick-password.page:46(p)
-msgid "To set an IRC server password:"
-msgstr "Pour paramétrer un mot de passe de serveur IRC :"
-
-#: C/irc-nick-password.page:54(p)
-msgid "Select the IRC account from the list on the left of the dialog."
-msgstr ""
-"Sélectionnez le compte IRC dans la liste sur la gauche de la boîte de "
-"dialogue."
-
-#: C/irc-nick-password.page:57(p)
-msgid ""
-"In the <gui>Password</gui> field, type the password you used to register "
-"your nikcname."
-msgstr ""
-"Dans le champ <gui>Mot de passe</gui>, saisissez le mot de passe que vous "
-"avez utilisé pour inscrire votre pseudonyme."
-
-#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
-#: C/add-account.page:74(p)
-msgid "Click <gui style=\"button\">Apply</gui>."
-msgstr "Cliquez sur <gui style=\"button\">Appliquer</gui>."
-
-#: C/irc-nick-password.page:69(p)
-msgid ""
-"These instructions only allow you to use a password-protected nickname on "
-"certain IRC networks. It is not currently possible to register an IRC "
-"nickname or change your nickname password using <app>Empathy</app>."
-msgstr ""
-"Ces instructions ne vous permettent d'utiliser un pseudonyme protégé par mot "
-"de passe que sur certains réseaux. Il n'est actuellement pas possible "
-"d'inscrire un pseudonyme IRC ou de modifier le mot de passe de votre "
-"pseudonyme en utilisant <app>Empathy</app>."
-
-#: C/irc-manage.page:10(desc)
-msgid "How to use IRC with <app>Empathy</app>."
-msgstr "Comment utiliser IRC avec <app>Empathy</app>."
-
-#: C/irc-manage.page:35(title)
-msgid "Internet Relay Chat (IRC)"
-msgstr "« Internet Relay Chat » (IRC)"
-
-#: C/irc-manage.page:38(p) C/account-irc.page:39(p)
-msgid ""
-"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
-"<app>Empathy</app>."
-msgstr ""
-"Le paquet <sys>telepathy-idle</sys> doit être installé pour utiliser IRC "
-"avec <app>Empathy</app>."
-
-#: C/irc-manage.page:42(link)
-msgid "Install telepathy-idle"
-msgstr "Installer telepathy-idle"
-
-#: C/irc-manage.page:49(title)
-msgid "IRC Chat Rooms and Conversations"
-msgstr "Salon de discussion et conversations IRC"
-
-#: C/irc-manage.page:51(title)
-msgid "Chat Rooms and Conversations"
-msgstr "Salon de discussion et conversations"
-
-#: C/irc-manage.page:56(title)
-msgid "Common IRC Problems"
-msgstr "Problèmes IRC courants"
-
-#: C/irc-manage.page:58(title) C/index.page:55(title)
-msgid "Common Problems"
-msgstr "Problèmes courants"
-
-#: C/irc-join-room.page:8(desc)
-msgid "Join an IRC channel."
-msgstr "Rejoindre un canal IRC."
-
-#: C/irc-join-room.page:31(title)
-msgid "Join an IRC chat room"
-msgstr "Connexion à un salon de discussion IRC"
-
-#: C/irc-join-room.page:33(p)
-msgid ""
-"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
-"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
-"account\"/> and <link xref=\"account-irc\"/>."
-msgstr ""
-"Vous pouvez rejoindre un salon de discussion IRC (également connus sous le "
-"nom de canaux IRC) sur n'importe quel réseau IRC auquel vous êtes connecté. "
-"Pour se connecter à un réseau IRC, consultez <link xref=\"add-account\"/> et "
-"<link xref=\"account-irc\"/>."
-
-#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
-#: C/group-conversations.page:122(p)
-msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Join</gui></guiseq>."
-msgstr ""
-"À partir de la fenêtre <gui>Liste des contacts</gui>, sélectionnez "
-"<guiseq><gui>Salon</gui><gui>Rejoindre</gui></guiseq>."
-
-#: C/irc-join-room.page:45(p)
-msgid ""
-"From the <gui>Account</gui> drop-down list, select the IRC account that "
-"corresponds to the network you want to use."
-msgstr ""
-"Dans la liste déroulante <gui>Compte</gui>, sélectionnez le compte IRC qui "
-"correspond au réseau que vous voulez utiliser."
-
-#: C/irc-join-room.page:51(p)
-msgid ""
-"In the <gui>Room</gui> text box, type the name of the channel you want to "
-"join. IRC channel names start with the hash character (<sys>#</sys>)."
-msgstr ""
-"Dans la zone de texte <gui>Salon</gui>, saisissez le nom du canal que vous "
-"voulez rejoindre. Les noms de canal IRC commencent par le caractère dièse "
-"(<sys>#</sys>)."
-
-#: C/irc-join-room.page:57(p)
-msgid "Click <gui>Join</gui> to enter the room."
-msgstr "Cliquez sur <gui>Rejoindre</gui> pour entrer dans le salon."
-
-#: C/irc-join-room.page:64(p)
-msgid ""
-"To join multiple rooms, you need to repeat the steps above for each room."
-msgstr ""
-"Pour rejoindre plusieurs salons, vous devez répéter les étapes précédentes "
-"pour chaque salon."
-
-#: C/irc-join-pwd.page:9(desc)
-msgid "Enter password-protected IRC chat rooms."
-msgstr "Se connecter à un salon de discussion IRC protégé."
-
-#: C/irc-join-pwd.page:25(title)
-msgid "Join a protected IRC chat room"
-msgstr "Connexion à un salon de discussion IRC protégé"
-
-#: C/irc-join-pwd.page:27(p)
-msgid ""
-"On some IRC networks, private IRC rooms may be protected with a password. If "
-"you know the password, use the following steps to join:"
-msgstr ""
-"Sur certains réseaux IRC, des salons de discussion IRC privés sont protégés "
-"par un mot de passe. Si vous le connaissez, utilisez les étapes suivantes "
-"pour les rejoindre :"
-
-#: C/irc-join-pwd.page:33(p)
-msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
-msgstr ""
-"<link xref=\"irc-join-room\">Rejoignez le salon</link> comme d'habitude."
-
-#: C/irc-join-pwd.page:38(p)
-msgid ""
-"Empathy will prompt you for a password. Enter the password for the IRC chat "
-"room and click <gui style=\"button\">Join</gui>."
-msgstr ""
-"Empathy vous demandera un mot de passe. Saisissez le mot de passe pour le "
-"salon de discussion IRC et cliquez sur <gui style=\"button\">Rejoindre</gui>."
-
-#: C/irc-commands.page:7(desc)
-msgid "The supported IRC commands."
-msgstr "Les commandes IRC prises en charge."
-
-#: C/irc-commands.page:18(title)
-msgid "Supported IRC commands"
-msgstr "Commandes IRC prises en charge"
-
-#: C/irc-commands.page:19(p)
-msgid ""
-"To see the list of the supported IRC commands, in a chat room type <input>/"
-"help</input> and press <key>Enter</key>."
-msgstr ""
-"Pour afficher la liste des commandes IRC prises en charge dans un salon de "
-"discussion, saisissez <input>/help</input> et appuyez sur <key>Entrée</key>."
-
-#: C/irc-commands.page:24(p)
-msgid "All commands available have a small description on their usage."
-msgstr "L'usage de toutes les commandes disponibles est décrit succinctement."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/introduction.page:41(None)
-msgid ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=54908dcb2588beddb15ef0968d2c2582"
-msgstr ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=54908dcb2588beddb15ef0968d2c2582"
-
-#: C/introduction.page:9(desc)
-msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr "Introduction à la messagerie instantanée <app>Empathy</app>."
-
-#: C/introduction.page:21(title)
+#: C/introduction.page:23(page/title)
 msgid "Introduction"
 msgstr "Introduction"
 
-#: C/introduction.page:23(p)
+#: C/introduction.page:25(page/p)
 msgid ""
-"<app>Empathy</app> is an instant messaging application for the GNOME "
-"Desktop. It supports text messaging, voice &amp; video calls, file "
-"transfers, and all the most used messaging systems such as MSN and Google "
-"Talk."
+"<app>Cheese</app> is a fun webcam booth application which lets you take "
+"photos and record videos using your webcam. By using <app>Cheese</app>, you "
+"can make funny, original photos and videos that you can easily share with "
+"others. It can take multiple photos in quick succession (using the <link "
+"xref=\"burst-mode\"><gui>Burst mode</gui></link>) and lets you <link xref="
+"\"apply-effects\">apply effects</link> that add a special, fancy or funny "
+"touch to your photos and videos."
 msgstr ""
-"<app>Empathy</app> est une application de messagerie instantanée pour le "
-"bureau GNOME. Elle prend en charge les messages textuels, les appels audio "
-"&amp; vidéo, le transfert de fichiers et la plupart des systèmes de "
-"messagerie les plus utilisés tels que MSN et Google Talk."
+"<app>Cheese</app> est une application amusante pour votre webcam qui vous "
+"permet de prendre des photos et de faire des vidéos avec votre webcam. En "
+"utilisant <app>Cheese</app>, vous pouvez faire des photos et des vidéos "
+"amusantes et originales que vous pouvez facilement partager avec les autres. "
+"Elle permet de prendre de multiples photos les unes à la suite des autres "
+"(en utilisant le <link xref=\"burst-mode\"><gui>mode rafale</gui></link>) et "
+"vous permet d'<link xref=\"apply-effects\">utiliser des effets</link> pour "
+"ajouter une touche spéciale, fantaisiste ou amusante à vos photos et vidéos."
 
-#: C/introduction.page:28(p)
+#: C/introduction.page:33(page/p)
 msgid ""
-"<app>Empathy</app> includes features that help you better collaborate while "
-"at work, and that let you easily keep in touch with your friends."
+"By default, <app>Cheese</app> starts in <gui>Photo mode</gui>, ready to "
+"<link xref=\"take-photo\">take a photo</link>. You need to switch to "
+"<gui>Video mode</gui> to <link xref=\"record-video\">record a video</link> "
+"or switch to <gui>Burst mode</gui> to <link xref=\"burst-mode\">take "
+"multiple photos at once</link>."
 msgstr ""
-"<app>Empathy</app> inclut des fonctionnalités qui vous aident à mieux "
-"collaborer dans le cadre du travail et à rester facilement en contact avec "
-"vos amis."
+"Par défaut, <app>Cheese</app> démarre en <gui>mode photo</gui>, prêt à <link "
+"xref=\"take-photo\">prendre une photo</link>. Vous devez basculer en "
+"<gui>mode vidéo</gui> pour <link xref=\"record-video\">prendre une vidéo</"
+"link> ou basculer en <gui>mode rafale</gui> pour <link xref=\"burst-mode"
+"\">prendre plusieurs photos d'un coup</link>."
 
-#: C/introduction.page:32(p)
+#: C/introduction.page:39(page/p)
 msgid ""
-"Using <app>Empathy</app>, you can group all the conversations in a single "
-"window, have multiple windows for different kind of conversations, easily "
-"search through your previous conversations, and share your desktop in just "
-"two clicks."
+"<app>Cheese</app> works with most webcams, but if your particular make and "
+"model does not seem to work properly, see <link xref=\"webcams\">Webcams</"
+"link> for advice on getting it to work."
 msgstr ""
-"En utilisant <app>Empathy</app>, vous pouvez regrouper toutes les "
-"conversations dans une seule fenêtre ou avoir plusieurs fenêtres pour chaque "
-"type de conversation, faire des recherches dans vos conversations "
-"précédentes et partager votre bureau en quelques clics."
-
-#: C/introduction.page:39(title)
-msgid "<gui>Contact List</gui> window"
-msgstr "Fenêtre <gui>Liste des contacts</gui>"
-
-#: C/introduction.page:40(desc)
-msgid "<app>Empathy</app> main window"
-msgstr "Fenêtre principale d'<app>Empathy</app>"
+"<app>Cheese</app> fonctionne avec la plupart des webcams, mais si la votre "
+"n'a pas l'air de fonctionner normalement, consultez <link xref=\"webcams"
+"\">Webcams</link> pour obtenir des conseils sur la manière dont vous "
+"pourriez la faire fonctionner."
 
-#: C/introduction.page:42(p)
-msgid "<app>Empathy</app> main window."
-msgstr "Fenêtre principale d'<app>Empathy</app>."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/index.page:28(None)
+#: C/mode-wide.page:19(info/desc)
 msgid ""
-"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+"Change the position of the photo stream so that the webcam video feed is "
+"larger."
 msgstr ""
-"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+"Modifier la position du flux d'images pour que l'entrée vidéo de la webcam "
+"soit plus grande."
 
-#: C/index.page:7(title) C/index.page:8(title)
-msgid "Empathy Internet Messenger"
-msgstr "Messagerie internet Empathy"
+#: C/mode-wide.page:23(page/title)
+msgid "Make the webcam video preview bigger"
+msgstr "Agrandir la prévisualisation de la vidéo de la webcam"
 
-#: C/index.page:27(title)
+#: C/mode-wide.page:25(page/p)
 msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
-"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+"The photo stream is where photos and videos appear after you have taken or "
+"recorded them. By default, it is a horizontal strip at the bottom of the "
+"<app>Cheese</app> window."
 msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Logo de Messagerie internet Empathy</media> Messagerie internet Empathy"
-
-#: C/index.page:35(title)
-msgid "Account Management"
-msgstr "Gestion des comptes"
-
-#: C/index.page:39(title)
-msgid "Contact Management"
-msgstr "Gestion des contacts"
-
-#: C/index.page:43(title)
-msgid "Text Conversations"
-msgstr "Conversations texte"
-
-#: C/index.page:47(title)
-msgid "Audio and Video Conversations"
-msgstr "Conversations audio et vidéo"
-
-#: C/index.page:51(title)
-msgid "Advanced Actions"
-msgstr "Actions avancées"
-
-#: C/import-account.page:10(desc)
-msgid "Import an account from another instant messaging application."
-msgstr ""
-"Importation de compte en provenance d'une autre application de messagerie "
-"instantanée."
-
-#: C/import-account.page:19(name)
-msgid "Peter Haslam"
-msgstr "Peter Haslam"
-
-#: C/import-account.page:20(email)
-msgid "peter.haslam@freenet.de"
-msgstr "peter.haslam@freenet.de"
-
-#: C/import-account.page:42(title)
-msgid "Import an existing account"
-msgstr "Importation d'un compte existant"
+"Le flux d'images est l'endroit où les photos et les vidéos apparaissent "
+"après avoir été prises ou enregistrées. Par défaut, c'est une bande "
+"horizontale en bas de la fenêtre <app>Cheese</app>."
 
-#: C/import-account.page:44(p)
+#: C/mode-wide.page:29(page/p)
 msgid ""
-"The first time you run <app>Empathy</app>, it will offer to import your "
-"accounts from other instant messaging applications. Currently, the only "
-"supported application is <app>Pidgin</app>."
+"You can make the photo stream appear as a vertical bar. This is useful if "
+"you have a wide computer screen which is not very high; switching to a "
+"vertical layout means that there is more room to display the video feed from "
+"the webcam."
 msgstr ""
-"À la première utilisation d'<app>Empathy</app>, il vous est proposé "
-"d'importer vos comptes à partir d'autres applications de messagerie "
-"instantanée. Actuellement la seule application prise en charge est "
-"<app>Pidgin</app>."
+"Vous pouvez afficher le flux d'images verticalement. C'est utile si vous "
+"avez un écran large mais pas très haut ; le passage à un affichage vertical "
+"laisse plus de place pour afficher l'entrée vidéo de la webcam."
 
-#: C/import-account.page:50(p)
+#: C/mode-wide.page:34(page/p)
 msgid ""
-"Run <app>Empathy</app> for the first time. An assistant will offer you a "
-"number of options to create new accounts."
+"To switch to a vertical layout, click <guiseq><gui>Cheese</gui> <gui>Wide "
+"Mode</gui></guiseq>. To switch back to a horizontal layout, uncheck the "
+"option."
 msgstr ""
-"Lancer <app>Empathy</app> pour la première fois. Un assistant vous propose "
-"un choix d'options pour créer de nouveaux comptes."
+"Pour passer à un affichage vertical, cliquez sur <guiseq><gui>Cheese</gui> "
+"<gui>Mode large</gui></guiseq>. Pour revenir à l'affichage horizontal, "
+"décochez l'option."
 
-#: C/import-account.page:54(p)
+#: C/mode-wide.page:39(note/p)
 msgid ""
-"Select <gui>Yes, import my account details from</gui> and click "
-"<gui>Forward</gui>."
+"Another way to increase the size of the webcam preview is to make "
+"<app>Cheese</app> fullscreen. To do this, click <guiseq><gui>Cheese</"
+"gui><gui>Fullscreen</gui></guiseq> or press <key>F11</key>. To quit the "
+"fullscreen mode, press <key>F11</key>."
 msgstr ""
-"Choisissez <gui>Oui, importer les détails de mon compte à partir de</gui> et "
-"cliquez sur <gui>Suivant</gui>."
+"Une autre façon d'agrandir le flux de la webcam est d'utiliser <app>Cheese</"
+"app> en mode plein écran. Pour cela, cliquez sur <guiseq><gui>Cheese</"
+"gui><gui>Plein écran</gui></guiseq> ou appuyez sur la touche <key>F11</key>. "
+"Pour quitter le mode plein écran, appuyez sur <key>F11</key>."
 
-#: C/import-account.page:58(p)
-msgid "Select the check box next to each account you wish to import."
-msgstr "Cochez la case en face de chaque compte que vous souhaitez importer."
+#: C/photo-delete.page:19(info/desc)
+msgid "Remove photos and videos that you no longer want to keep."
+msgstr "Supprimer des photos et des vidéos que vous ne voulez plus garder."
 
-#: C/import-account.page:66(p)
-msgid ""
-"It is not currently possible to import accounts after you have completed the "
-"first-run assistant."
-msgstr ""
-"Il n'est actuellement pas possible d'importer des comptes après avoir "
-"terminé l'assistant de premier lancement."
+#: C/photo-delete.page:22(page/title)
+msgid "Delete a photo or video"
+msgstr "Suppression d'une photo ou d'une vidéo"
 
-#: C/hide-contacts.page:8(desc)
-msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+#: C/photo-delete.page:24(page/p)
+msgid "If you no longer want a photo or video, you can permanently delete it:"
 msgstr ""
-"Masquer les contacts hors ligne de votre <gui>Liste des contacts</gui>."
-
-#: C/hide-contacts.page:19(title)
-msgid "Hide offline contacts"
-msgstr "Masquage des contacts hors ligne"
+"Si vous ne voulez plus d'une photo ou d'une vidéo, vous pouvez la supprimer "
+"définitivement :"
 
-#: C/hide-contacts.page:21(p)
+#: C/photo-delete.page:28(item/p)
 msgid ""
-"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
-"with which you can have a conversation, and also those that are offline."
+"Find the photo or video that you want to delete in the photo stream at the "
+"bottom of the <app>Cheese</app> window."
 msgstr ""
-"Normalement, <app>Empathy</app> affiche tous vos contacts : ceux qui sont en "
-"ligne, avec lesquels vous pouvez avoir une conversation mais aussi ceux qui "
-"sont hors ligne."
+"Trouvez la photo ou la vidéo que vous voulez supprimer dans le flux d'images "
+"en bas de la fenêtre <app>Cheese</app>."
 
-#: C/hide-contacts.page:25(p)
-msgid "To hide the contacts that are offline:"
-msgstr "Pour masquer les contacts qui sont hors ligne :"
-
-#: C/hide-contacts.page:31(p)
+#: C/photo-delete.page:32(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</"
-"key><key>H</key></keyseq>."
-msgstr ""
-"À partir de la fenêtre <gui>Liste des contacts</gui>, sélectionnez "
-"<guiseq><gui>Affichage</gui><gui>Contacts déconnectés</gui></guiseq>, ou "
-"appuyez sur <keyseq><key>Ctrl</key><key>H</key></keyseq>."
-
-#: C/hide-contacts.page:36(p)
-msgid "To show the offline contacts again, repeat the same procedure above."
+"Right-click it and select <gui>Delete</gui>. Alternatively, click it once to "
+"select it and press the <key>Delete</key> key."
 msgstr ""
-"Pour afficher à nouveau les contacts hors ligne, répétez la procédure "
-"précédente."
-
-#: C/group-conversations.page:8(desc)
-msgid "Start or join a group conversation with your contacts."
-msgstr "Commencer ou rejoindre une conversation de groupe avec vos contacts."
-
-#: C/group-conversations.page:34(title)
-msgid "Group conversations"
-msgstr "Conversations de groupe"
+"Faites un clic droit et sélectionnez <gui>Supprimer</gui>. Vous pouvez aussi "
+"cliquer une fois pour la sélectionner puis appuyer sur la touche <key>Suppr</"
+"key>."
 
-#: C/group-conversations.page:36(p)
+#: C/photo-delete.page:36(item/p)
 msgid ""
-"Group conversations permits you to have text conversations with more than "
-"one contact at the same time."
+"You will be asked if you want to permanently delete it. Confirm by clicking "
+"<gui>Delete</gui>; you will not be able to recover the photo."
 msgstr ""
-"Les conversations de groupe vous permettent d'avoir des conversations "
-"textuelles avec plus d'un contact à la fois."
+"Il vous est demandé si vous souhaitez la supprimer définitivement. Confirmez "
+"en cliquant sur <gui>Supprimer</gui>. Vous ne pourrez plus récupérer la "
+"photo."
 
-#: C/group-conversations.page:40(p)
+#: C/photo-delete.page:41(page/p)
 msgid ""
-"To have a group conversation you need to have a registered account with "
-"either Jabber or Google Talk, or a People Nearby account."
+"If you are not sure whether you want to permanently delete the photo or "
+"video, you can right click it and select <gui>Move to Trash</gui> instead. "
+"This will move it to the computer's <gui>Trash</gui> folder."
 msgstr ""
-"Pour avoir une conversation de groupe, vous devez posséder un compte Jabber "
-"ou Google Talk ou un compte Personnes à proximité."
+"Si vous n'êtes pas sûr de vouloir supprimer de manière définitive une photo "
+"ou une vidéo, vous pouvez faire un clic droit dessus et sélectionner "
+"<gui>Mettre à la corbeille</gui> à la place. La photo est alors déplacée "
+"dans le dossier <gui>Corbeille</gui> de l'ordinateur."
 
-#: C/group-conversations.page:46(p)
+#: C/photo-delete.page:45(note/p)
 msgid ""
-"You can have a group conversation only with the contacts that are using the "
-"same service as yours."
+"Cheese does not have its own <gui>Trash</gui> folder and you cannot access "
+"your computer's <gui>Trash</gui> folder from within <app>Cheese</app>."
 msgstr ""
-"Vous ne pouvez avoir de conversation de groupe qu'avec des contacts qui "
-"utilisent le même service que vous."
+"Cheese ne possède pas de dossier <gui>Corbeille</gui> personnel et vous ne "
+"pouvez pas accéder au dossier <gui>Corbeille</gui> à partir de <app>Cheese</"
+"app>."
 
-#: C/group-conversations.page:54(title)
-msgid "Start a group conversation"
-msgstr "Démarrage d'une conversation de groupe"
+#: C/photo-save.page:19(info/desc)
+msgid "Save a photo or video in a different folder."
+msgstr "Enregistrer une photo ou une vidéo dans un dossier différent."
 
-#: C/group-conversations.page:63(p)
-msgid ""
-"From the <gui>Account</gui> drop-down list, select the account you want to "
-"use for the group conversation."
-msgstr ""
-"Dans la liste déroulante <gui>Compte</gui>, sélectionnez le compte que vous "
-"voulez utiliser pour la conversation de groupe."
+#: C/photo-save.page:22(page/title)
+msgid "Save a photo or video"
+msgstr "Enregistrement d'une photo ou d'une vidéo"
 
-#: C/group-conversations.page:69(p)
+#: C/photo-save.page:24(page/p)
 msgid ""
-"In the <gui>Server</gui> text box, type the name of server in which the "
-"conversation will be hosted."
+"By default, Cheese saves the photos and videos in the <guiseq><gui>Pictures</"
+"gui><gui>Webcam</gui></guiseq> and <guiseq><gui>Videos</gui><gui>Webcam</"
+"gui></guiseq> folders in your user folder."
 msgstr ""
-"Dans la zone de texte <gui>Serveur</gui>, saisissez le nom du serveur qui "
-"hébergera la conversation."
+"Par défaut, Cheese enregistre les photos et les vidéos dans les dossiers "
+"<guiseq><gui>Images</gui><gui>Webcam</gui></guiseq> et <guiseq><gui>Vidéos</"
+"gui><gui>Webcam</gui></guiseq> de votre dossier Personnel."
 
-#: C/group-conversations.page:73(p)
-msgid "Leave it empty if it will be on the current server."
-msgstr "Laissez-la vide, s'il s'agit du serveur actuel."
-
-#: C/group-conversations.page:78(p)
+#: C/photo-save.page:29(page/p)
 msgid ""
-"In the <gui>Room</gui> text box, type the name you want to give to the "
-"conversation."
+"To save an image to a different location, right-click the image in the photo "
+"stream and click <gui>Save As</gui>. Then, choose where you want to save the "
+"image."
 msgstr ""
-"Dans la zone de texte <gui>Salon</gui>, saisissez le nom que vous souhaitez "
-"donner à la conversation."
+"Pour enregistrer une image dans un autre dossier, faites un clic droit sur "
+"la photo dans le flux d'images et cliquez sur <gui>Enregistrer sous</gui> "
+"puis choisissez le dossier où vous voulez enregistrer l'image."
 
-#: C/group-conversations.page:82(p)
+#: C/photo-save.page:33(page/p)
 msgid ""
-"This will be the name of the room you are going to have a conversation. This "
-"name will be publicly available for other people to join. It is not possible "
-"to create a private room."
+"Alternatively, open the folder where you want to keep the image using the "
+"file manager, then drag it from the photo stream into that folder."
 msgstr ""
-"C'est le nom du salon dans lequel vous allez avoir une conversation. Ce nom "
-"sera rendu public pour que d'autres personnes le rejoignent. Il n'est pas "
-"possible de créer un salon privé."
+"Vous pouvez aussi utiliser le gestionnaire de fichiers pour ouvrir le "
+"dossier où vous souhaitez enregistrer l'image, puis la glisser du flux "
+"d'images vers le dossier."
 
-#: C/group-conversations.page:90(p)
+#: C/photo-save.page:36(page/p)
 msgid ""
-"To invite other contacts to join the group conversation, from the "
-"<gui>Contact List</gui> window, select the contact you want to invite, and "
-"perform one of the following:"
-msgstr ""
-"Pour inviter d'autres contacts à rejoindre la conversation de groupe, "
-"sélectionnez dans la fenêtre <gui>Liste des contacts</gui> le contact que "
-"vous souhaitez inviter et effectuez une des actions suivantes :"
-
-#: C/group-conversations.page:97(p)
-msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
+"A new copy of the image will be saved in the new location. The old version "
+"will remain in the <guiseq><gui>Pictures</gui><gui>Webcam</gui></guiseq> or "
+"<guiseq><gui>Videos</gui><gui>Webcam</gui></guiseq> folder."
 msgstr ""
-"Cliquez droit sur le contact et choisissez <gui>Inviter à un salon de "
-"discussion</gui>."
-
-#: C/group-conversations.page:102(p)
-msgid ""
-"Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</"
+"Une nouvelle copie de l'image est enregistrée dans le nouvel emplacement. "
+"L'ancienne version reste dans le dossier <guiseq><gui>Images</"
+"gui><gui>Webcam</gui></guiseq> ou <guiseq><gui>Vidéos</gui><gui>Webcam</"
 "gui></guiseq>."
-msgstr ""
-"Choisissez <guiseq><gui>Édition</gui><gui>Contact</gui><gui>Inviter à un "
-"salon de discussion</gui></guiseq>."
-
-#: C/group-conversations.page:107(p)
-msgid ""
-"If you have more than one group conversation open, select the one you want "
-"to invite your contacts."
-msgstr ""
-"Si plusieurs conversations de groupe sont ouvertes, choisissez celle à "
-"laquelle vous invitez vos contacts."
-
-#: C/group-conversations.page:118(title)
-msgid "Join a group conversation"
-msgstr "Connexion à une conversation de groupe"
-
-#: C/group-conversations.page:128(p)
-msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
-msgstr ""
-"Agrandir la section <gui>liste des salons</gui> pour afficher tous les "
-"salons existants."
-
-#: C/group-conversations.page:133(p)
-msgid "Double-click on the name of a room to join it."
-msgstr "Double-cliquez sur le nom d'un salon pour le rejoindre."
-
-#: C/group-conversations.page:139(p)
-msgid ""
-"It is not possible to join all existing rooms. Some of the rooms might "
-"require a password, or might be invitation only. <app>Empathy</app> does not "
-"support these kind of rooms."
-msgstr ""
-"Il n'est pas possible de rejoindre tous les salons existants. Il se peut que "
-"certains salons demandent un mot de passe ou ne soient accessibles que sur "
-"invitation. <app>Empathy</app> ne prend pas en charge ces types de salons."
-
-#: C/geolocation-what-is.page:9(desc)
-msgid "Understanding geolocation."
-msgstr "Comprendre la géolocalisation."
-
-#: C/geolocation-what-is.page:33(title)
-msgid "What is geolocation"
-msgstr "À propos de la géolocalisation"
-
-#: C/geolocation-what-is.page:35(p)
-msgid ""
-"Geolocation allows you to identify the real geographical location of a "
-"computer or a device connected to the Internet."
-msgstr ""
-"La géolocalisation vous permet d'identifier la vraie position géographique "
-"d'un ordinateur ou d'un appareil connecté à internet."
-
-#: C/geolocation-what-is.page:37(p)
-msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr "Avec la géolocalisation dans <app>Empathy</app> vous pouvez :"
-
-#: C/geolocation-what-is.page:42(p)
-msgid "Publish your geographical location to your contacts."
-msgstr "Publier votre position géographique pour vos contacts."
-
-#: C/geolocation-what-is.page:47(p)
-msgid "See your contacts’ geographical location and quickly contact them."
-msgstr ""
-"Voir la position géographique de vos contacts et les contacter rapidement."
-
-#: C/geolocation-what-is.page:52(p)
-msgid ""
-"Set the accuracy of your location and the device used to discover your "
-"location."
-msgstr ""
-"Paramétrer la précision de votre localisation et le périphérique à utiliser "
-"pour retrouver votre position."
-
-#: C/geolocation-what-is.page:60(p)
-msgid ""
-"In order to see your contacts’ geographical locations, they need to use a "
-"service and an application that supports geolocation."
-msgstr ""
-"Afin de pouvoir voir la position géographique de vos contacts, ils doivent "
-"utiliser un service et une application qui prend en charge la "
-"géolocalisation."
-
-#: C/geolocation-turn.page:9(desc)
-msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr ""
-"Comment activer ou désactiver la géolocalisation dans <app>Empathy</app>."
-
-#: C/geolocation-turn.page:33(title)
-msgid "Activate/Deactivate geolocation"
-msgstr "Activation/désactivation de la géolocalisation"
-
-#: C/geolocation-turn.page:37(p)
-msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
-msgstr "Choisissez <guiseq><gui>Édition</gui><gui>Préférences</gui></guiseq>."
-
-#: C/geolocation-turn.page:42(p)
-msgid "Select the <gui>Location</gui> tab."
-msgstr "Sélectionnez l'onglet <gui>Position</gui>."
-
-#: C/geolocation-turn.page:47(p)
-msgid ""
-"Select <gui>Publish location to my contacts</gui> to activate geolocation."
-msgstr ""
-"Sélectionnez <gui>Publier ma position pour mes contacts</gui> pour activer "
-"la géolocalisation."
-
-#: C/geolocation-turn.page:50(p)
-msgid "To deactivate geolocation, deselect it."
-msgstr "Pour désactiver la géolocalisation, désélectionnez-le."
-
-#: C/geolocation-turn.page:55(p)
-msgid ""
-"To increase the accuracy of your position, deselect <gui>Reduce location "
-"accuracy</gui>."
-msgstr ""
-"Pour augmenter la précision de votre position, décocher <gui>Réduire la "
-"précision de la position</gui>."
 
-#: C/geolocation-turn.page:61(p)
-msgid ""
-"If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <gui>Location sources</gui> "
-"section."
-msgstr ""
-"Si vous disposez d'un périphérique externe comme un GPS ou que vous vouliez "
-"envoyer une position plus précise, choisissez l'option appropriée dans la "
-"section <gui>Sources de positionnement</gui>."
-
-#: C/geolocation-supported.page:7(desc)
-msgid "Services that supports geolocation and compatibility."
-msgstr "Services prenant en charge la géolocalisation et compatibilité."
-
-#: C/geolocation-supported.page:31(title)
-msgid "Supported services"
-msgstr "Services pris en charge"
-
-#: C/geolocation-supported.page:33(p)
-msgid ""
-"The geolocation feature at the moment is compatible only with the Jabber "
-"service. In order to use it, you and your contacts need to have a Jabber "
-"account."
-msgstr ""
-"La fonction de géolocalisation n'est pour le moment compatible qu'avec le "
-"service Jabber. Afin de l'utiliser, vous et votre contact doivent avoir un "
-"compte Jabber."
-
-#: C/geolocation-supported.page:39(p)
-msgid ""
-"It is necessary that also the server you are using supports the geolocation "
-"feature. Most of the Jabber servers support it. See your service website "
-"documentation for more information."
-msgstr ""
-"Il est aussi nécessaire que le serveur que vous utilisez actuellement prenne "
-"en charge la fonction de géolocalisation. La plupart des serveurs Jabber le "
-"font. Consultez la documentation sur le site Web concernant les services "
-"pour plus d'informations."
-
-#: C/geolocation-supported.page:47(title)
-msgid "Compatibility"
-msgstr "Compatibilité"
+#: C/photo-take.page:24(info/desc)
+msgid "Use your webcam to take photos instead of videos."
+msgstr "Utiliser sa webcam pour faire des photos plutôt que des vidéos."
 
-#: C/geolocation-supported.page:49(p)
-msgid ""
-"<app>Empathy</app> geolocation feature is not compatible with other "
-"geographical position services such as <em>Google Latitude</em>, <em>Yahoo "
-"Fire Eagle</em> or <em>Brightkite</em>."
-msgstr ""
-"La fonction de géolocalisation <app>Empathy</app> n'est pas compatible avec "
-"d'autres services de positionnement géographique tels que <em>Google "
-"Latitude</em>, <em>Yahoo Fire Eagle</em> ou <em>Brightkite</em>."
-
-#: C/geolocation-privacy.page:8(desc)
-msgid "What information are sent and to who."
-msgstr "Quelles informations sont envoyées et à qui."
-
-#: C/geolocation-privacy.page:32(title)
-msgid "Geolocation Privacy"
-msgstr "Confidentialité de la géolocalisation"
-
-#: C/geolocation-privacy.page:35(title)
-msgid "What information is sent"
-msgstr "Informations envoyées"
-
-#: C/geolocation-privacy.page:36(p)
-msgid ""
-"What is possible to send is: your country, region, locality, area, street, "
-"building, floor, room, and postal code, longitude, latitude and altitude, "
-"speed and bearing."
-msgstr ""
-"Il est possible d'envoyer votre pays, département, ville, quartier, rue, "
-"bâtiment, étage, numéro d'appartement et code postal, votre longitude, "
-"latitude et altitude, votre vitesse et allure."
-
-#: C/geolocation-privacy.page:40(p)
-msgid ""
-"The accuracy and the quantity of information about your geographical "
-"position are based on the software or on the infrastructure used to discover "
-"your position."
-msgstr ""
-"La précision et la quantité d'information sur votre position géographique "
-"sont basées sur le logiciel ou l'infrastructure utilisé pour découvrir votre "
-"position."
+#: C/photo-take.page:27(page/title)
+msgid "Take photos with the webcam"
+msgstr "Prise de photos avec la webcam"
 
-#: C/geolocation-privacy.page:44(p)
+#: C/photo-take.page:29(page/p)
 msgid ""
-"Different kind of networks may have different accuracy settings, and may "
-"send different information. The use of external devices such as GPS or "
-"mobile phone will increase the accuracy of the information sent."
+"Webcams can be used to take still photos, as well as videos. To take a photo:"
 msgstr ""
-"Il se peut que différents types de réseaux possèdent des réglages de "
-"précision différents et envoient des informations différentes. L'utilisation "
-"de périphériques externes type GPS ou téléphone mobile augmente la précision "
-"et la quantité des informations envoyées."
-
-#: C/geolocation-privacy.page:49(p)
-msgid ""
-"When the privacy mode is enabled, nothing more precise than your city will "
-"be sent, even if you are using an external device."
-msgstr ""
-"Lorsque le mode confidentiel est activé, seule votre ville sera envoyée même "
-"si vous utilisez un périphérique externe."
-
-#: C/geolocation-privacy.page:56(title)
-msgid "Who can see the information sent"
-msgstr "Qui peut voir les informations envoyées"
-
-#: C/geolocation-privacy.page:57(p)
-msgid "Only your contacts can see your geographical position."
-msgstr "Seul vos contacts peuvent voir votre position géographique."
-
-#: C/geolocation-privacy.page:63(title)
-msgid "What is the privacy mode"
-msgstr "Qu'est-ce que le mode confidentiel"
-
-#: C/geolocation-privacy.page:64(p)
-msgid ""
-"The privacy mode, enabled by default, is a reduced accuracy mode that will "
-"decrease the accuracy of the geographical position sent to your contacts."
-msgstr ""
-"Le mode confidentiel, activé par défaut, est un mode de précision réduite "
-"qui va réduire la précision de la position géographique envoyée à vos "
-"contacts."
-
-#: C/geolocation-privacy.page:71(title)
-msgid "Privacy overview"
-msgstr "Résumé sur la confidentialité"
-
-#: C/geolocation-privacy.page:72(p)
-msgid ""
-"Overview of the various geolocation privacy settings in <app>Empathy</app>."
-msgstr ""
-"Résumé sur les différents réglages de confidentialité de la géolocalisation "
-"dans <app>Empathy</app>."
-
-#: C/geolocation-privacy.page:77(p)
-msgid "Geolocation is not enabled by default."
-msgstr "La géolocalisation n'est pas activée par défaut."
-
-#: C/geolocation-privacy.page:82(p)
-msgid "Privacy mode is enabled by default."
-msgstr "Le mode confidentiel est activé par défaut."
-
-#: C/geolocation-privacy.page:87(p)
-msgid ""
-"Privacy mode prevails even when using external and more precise devices."
-msgstr ""
-"Le mode confidentiel prévaut même en cas d'utilisation de périphériques "
-"externes plus précis."
-
-#: C/geolocation-privacy.page:92(p)
-msgid "Only your contacts can see your position."
-msgstr "Seul vos contacts peuvent voir votre position."
-
-#: C/geolocation-not-showing.page:8(desc)
-msgid "<app>Empathy</app> does not publish my geographical position."
-msgstr "<app>Empathy</app> ne publie pas ma position géographique."
-
-#: C/geolocation-not-showing.page:32(title)
-msgid "Geographical position not published"
-msgstr "Position géographique non publiée"
+"Les webcams permettent de prendre aussi bien des photos que des vidéos. Pour "
+"prendre une photo :"
 
-#: C/geolocation-not-showing.page:34(p)
+#: C/photo-take.page:34(item/p)
 msgid ""
-"If your contacts cannot see your location, <app>Empathy</app> might not be "
-"able to discover with a good margin of precision your geographical position."
+"Make sure that you're in <gui>Photo mode</gui>. If you are, the button in "
+"the main window will say <gui>Take a Photo</gui>."
 msgstr ""
-"Si vos contacts ne peuvent voir votre position, il est possible que "
-"<app>Empathy</app> ne puisse pas trouver avec une bonne marge de précision "
-"votre position géographique."
+"Vérifiez que vous êtes dans le <gui>Mode photo</gui>. Si c'est le cas, le "
+"bouton de la fenêtre principale affiche <gui>Prendre une photo</gui>."
 
-#: C/geolocation-not-showing.page:38(p)
+#: C/photo-take.page:36(item/p)
 msgid ""
-"In this case, your position will not be published, but you are still able to "
-"see the location of your contacts."
-msgstr ""
-"Dans ce cas, votre position ne sera pas publiée, mais vous êtes toujours "
-"capable de voir la position de vos contacts."
-
-#: C/geolocation-not-showing.page:42(p)
-msgid ""
-"If you want to publish your geographical position, you can try to use an "
-"external device such as a GPS."
-msgstr ""
-"Si vous voulez publier votre position géographique, vous pouvez essayer "
-"d'utiliser un périphérique externe tel qu'un GPS."
-
-#: C/geolocation-not-showing.page:48(p)
-msgid ""
-"In order to publish your geographical location, your Jabber server needs to "
-"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
-"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
-"PEP</link> is maintained online. Google Talk does not support this feature "
-"at this time."
-msgstr ""
-"Afin de pouvoir publier votre position géographique, votre service Jabber "
-"doit prendre en charge le protocole Personal Eventing Protocal (PEP). Une "
-"liste de <link href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html"
-"\">serveurs prenant en charge le PEP</link> est conservée en ligne. Google "
-"Talk ne prend pas actuellement en charge cette fonctionnalité."
-
-#: C/geolocation.page:8(desc)
-msgid "Use and understand geolocation in <app>Empathy</app>."
-msgstr ""
-"Utilisation et compréhension de la géolocalisation dans <app>Empathy</app>."
-
-#: C/geolocation.page:32(title)
-msgid "Geographical position"
-msgstr "Position géographique"
-
-#: C/geolocation.page:35(title)
-msgid "Geolocation"
-msgstr "Géolocalisation "
-
-#: C/geolocation.page:39(title)
-msgid "Fix common problems"
-msgstr "Résolution des problèmes courants"
-
-#: C/favorite-rooms.page:10(desc)
-msgid "Set, join and manage favorite rooms."
-msgstr "Paramétrer, rejoindre et gérer vos salons favoris."
-
-#: C/favorite-rooms.page:29(title)
-msgid "Favorite rooms"
-msgstr "Salons favoris."
-
-#: C/favorite-rooms.page:32(title)
-msgid "Set a room as a favorite"
-msgstr "Paramétrage de salons favoris"
-
-#: C/favorite-rooms.page:35(p)
-msgid "Join a room."
-msgstr "Rejoignez un salon."
-
-#: C/favorite-rooms.page:40(p)
-msgid ""
-"See <link xref=\"irc-join-room\"/> for more information on how to join an "
-"IRC room."
-msgstr ""
-"Consultez <link xref=\"irc-join-room\"/> pour plus d'informations sur la "
-"manière de rejoindre un salon IRC."
-
-#: C/favorite-rooms.page:46(p)
-msgid ""
-"See <link xref=\"group-conversations\"/> for more information on how to "
-"start or join a group conversation."
-msgstr ""
-"Consultez <link xref=\"group-conversations\"/> pour plus d'informations sur "
-"la manière de démarrer ou rejoindre une conversation de groupe."
-
-#: C/favorite-rooms.page:54(p)
-msgid ""
-"From the conversation window, choose <guiseq><gui>Conversation</"
-"gui><gui>Favorite Chat Room</gui></guiseq>."
-msgstr ""
-"Dans la fenêtre conversation, choisissez <guiseq><gui>Conversation</"
-"gui><gui>Salons de discussion favoris</gui></guiseq>."
-
-#: C/favorite-rooms.page:63(title)
-msgid "Join favorite rooms"
-msgstr "Accès aux salons favoris"
-
-#: C/favorite-rooms.page:71(p)
-msgid "Press <key>F5</key>."
-msgstr "Appuyez sur <key>F5</key>."
-
-#: C/favorite-rooms.page:76(p)
-msgid ""
-"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
-"all your favorite rooms."
-msgstr ""
-"Choisissez <guiseq><gui>Salon</gui><gui>Joindre les favoris</gui></guiseq>, "
-"pour joindre tous vos salons favoris."
-
-#: C/favorite-rooms.page:82(p)
-msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
-msgstr ""
-"Choisissez <gui>Salon</gui> et sélectionnez le salon favori que vous voulez "
-"joindre."
-
-#: C/favorite-rooms.page:90(p)
-msgid ""
-"To join a favorite room, you need to be connected to the Internet and to "
-"your account."
-msgstr ""
-"Pour joindre un salon favori, vous devez être connecté à internet et à votre "
-"compte."
-
-#: C/favorite-rooms.page:98(title)
-msgid "Manage favorite rooms"
-msgstr "Gestion de vos salons favoris"
-
-#: C/favorite-rooms.page:101(p)
-msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Manage Favorites</gui></guiseq>."
-msgstr ""
-"À partir de la fenêtre <gui>Liste des contacts</gui>, choisissez "
-"<guiseq><gui>Salon</gui><gui>Gérer les salons favoris</gui></guiseq>."
-
-#: C/favorite-rooms.page:107(p)
-msgid ""
-"From the <gui>Account</gui> drop-down list, select the account you want to "
-"manage the favorite rooms of."
-msgstr ""
-"Dans la liste déroulante <gui>Compte</gui>, sélectionnez le compte pour "
-"lequel vous voulez gérer les salons favoris."
-
-#: C/favorite-rooms.page:111(p)
-msgid "Select <gui>All</gui> to see all you favorite rooms."
-msgstr "Sélectionnez <gui>Tous</gui> pour afficher tous vos salons favoris."
-
-#: C/favorite-rooms.page:116(p)
-msgid "Select the favorite room you want to manage:"
-msgstr "Sélectionnez le salon favori que vous voulez gérer :"
-
-#: C/favorite-rooms.page:121(p)
-msgid ""
-"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
-"that room when you connect to your account."
-msgstr ""
-"Cochez la case <gui>Connexion automatique</gui> afin de joindre "
-"automatiquement ce salon lorsque vous vous connectez à votre compte."
-
-#: C/favorite-rooms.page:127(p)
-msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
-msgstr ""
-"Cliquez sur <gui>Supprimer</gui> pour supprimer le salon de vos favoris."
-
-#: C/favorite-rooms.page:134(p)
-msgid "When done, click <gui>Close</gui>."
-msgstr "Lorsque vous avez terminé, cliquez sur <gui>Fermer</gui>."
-
-#: C/disable-account.page:9(desc)
-msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
-msgstr ""
-"Empêcher <app>Empathy</app> de se connecter automatiquement sur un compte."
-
-#: C/disable-account.page:40(title)
-msgid "Disable an account"
-msgstr "Désactivation d'un compte"
-
-#: C/disable-account.page:42(p)
-msgid ""
-"You can disable an account to prevent <app>Empathy</app> from logging in to "
-"it without removing the account entirely. You may wish to disable and re-"
-"enable an account if you only want to be logged in to the account at certain "
-"times, but you still want to use <app>Empathy</app> for other accounts."
-msgstr ""
-"Vous pouvez désactiver un compte pour empêcher <app>Empathy</app> de se "
-"connecter sur celui-ci sans supprimer le compte complètement. Il se peut que "
-"vous vouliez désactiver et activer un compte si vous ne voulez être connecté "
-"sur ce compte qu'à certain instant, mais tout en utilisant <app>Empathy</"
-"app> pour d'autres comptes."
-
-#: C/disable-account.page:53(p)
-msgid ""
-"Select the account you wish to disable from the accounts list on the left "
-"side of the window."
-msgstr ""
-"Sélectionnez le compte que vous souhaitez désactiver dans la liste des "
-"comptes dans la partie gauche de la fenêtre."
-
-#: C/disable-account.page:57(p)
-msgid "On the right side of the window, switch it off."
-msgstr "Sur le côté droit de la fenêtre, désactivez-le."
-
-#: C/disable-account.page:62(p)
-msgid "To re-enable the account, switch it on."
-msgstr "Pour réactiver le compte, activez-le."
-
-#: C/create-account.page:9(desc)
-msgid "Register for an account with one of the supported messaging services."
-msgstr ""
-"S'inscrire à un compte avec l'un des services de messagerie pris en charge."
-
-#: C/create-account.page:34(title)
-msgid "Register for a new account"
-msgstr "Inscription à un nouveau compte"
-
-#: C/create-account.page:36(p)
-msgid ""
-"Most account types require you to create an account with a account provider "
-"before you can connect using instant messaging applications like "
-"<app>Empathy</app>. With some account providers, you can use <app>Empathy</"
-"app> to register for a new account, using the same steps as you would to "
-"<link xref=\"add-account\">add an account</link>."
-msgstr ""
-"Pour la plupart des comptes, il est nécessaire de créer un compte avec un "
-"fournisseur de compte avant de pouvoir se connecter en utilisant des "
-"applications de messagerie instantanée comme <app>Empathy</app>. Avec "
-"certains fournisseurs de compte, vous pouvez utiliser <app>Empathy</app> "
-"pour enregistrer un nouveau compte en utilisant les mêmes étapes que celles "
-"pour <link xref=\"add-account\">Ajouter un compte</link>."
-
-#: C/create-account.page:42(p)
-msgid ""
-"This page provides information on creating a new account for various types "
-"of accounts. Your account provider should give you a login ID and a "
-"password, as well as any additional information you need to connect using "
-"<app>Empathy</app>."
-msgstr ""
-"Cette page fournit des informations sur la façon de créer un nouveau compte "
-"pour divers types de comptes. Votre fournisseur de compte devrait vous "
-"fournir un identifiant de connexion et un mot de passe ainsi que d'autres "
-"informations qui peuvent être nécessaires pour se connecter en utilisant "
-"<app>Empathy</app>."
-
-#: C/create-account.page:47(title)
-msgid "Facebook"
-msgstr "Facebook"
-
-#: C/create-account.page:48(p)
-msgid ""
-"Facebook is one of the most-used social networks. It allows users to create "
-"their own profile and to communicate with their friends."
-msgstr ""
-"Facebook est l'un des réseaux sociaux le plus utilisé. Il permet aux "
-"utilisateurs de créer leur propre profil et de communiquer avec leurs amis."
-
-#: C/create-account.page:52(p)
-msgid ""
-"To use Facebook to communicate with your friends, you will need to create a "
-"new account from the website: <link href=\"http://www.facebook.com\">www."
-"facebook.com</link>."
-msgstr ""
-"Pour utiliser Facebook pour communiquer avec vos amis, vous devez créer un "
-"nouveau compte sur le site Web : <link href=\"http://www.facebook.com\">www."
-"facebook.com</link>."
-
-#: C/create-account.page:60(title) C/audio-video.page:170(p)
-msgid "Jabber"
-msgstr "Jabber"
-
-#: C/create-account.page:62(p)
-msgid ""
-"Jabber is an open instant messaging system. Like email, Jabber allows you to "
-"choose your account provider and communicate with all other Jabber users, "
-"regardless of their account provider."
-msgstr ""
-"Jabber est un système de messagerie instantanée ouvert. Tout comme les "
-"courriels, Jabber vous permet de choisir votre fournisseur de compte et de "
-"communiquer avec tous les autres utilisateurs de Jabber, indépendamment de "
-"leur fournisseur de compte."
-
-#: C/create-account.page:66(p)
-msgid ""
-"You will need to create a new account with a Jabber provider. There are many "
-"free providers; one popular provider is <link href=\"http://register.jabber."
-"org/\">Jabber.org</link>."
-msgstr ""
-"Vous devez créer un nouveau compte avec un fournisseur Jabber. Il y a de "
-"nombreux fournisseurs gratuits ; un fournisseur célèbre est <link href="
-"\"http://register.jabber.org/\">Jabber.org</link>."
-
-#: C/create-account.page:71(p)
-msgid ""
-"If you use Google Mail or Google Talk, you already have a Jabber account. "
-"Google Talk is a Jabber service. Simply use your Google Mail address and "
-"password in <app>Empathy</app> to connect."
-msgstr ""
-"Si vous utilisez Google Mail ou Google Talk, vous avez déjà un compte "
-"Jabber. Google Talk est un service Jabber. Utilisez tout simplement votre "
-"adresse électronique Google Mail et votre mot de passe dans <app>Empathy</"
-"app> pour vous connecter."
-
-#: C/create-account.page:78(title) C/audio-video.page:190(p)
-msgid "People Nearby"
-msgstr "Personnes à proximité"
-
-#: C/create-account.page:80(p)
-msgid ""
-"You do not need to create an account with a service provider to use this "
-"feature. This service works whenever you are connected to a local network, "
-"such as a wireless hotspot. It automatically finds all other users on the "
-"network who are also using this service."
-msgstr ""
-"Vous n'avez pas à créer de compte avec un fournisseur de service pour "
-"utiliser cette fonctionnalité. Ce service fonctionne dès l'instant où vous "
-"êtes connecté à réseau local tel qu'une zone de connexion WiFi. Il recherche "
-"automatiquement tous les autres utilisateurs sur le réseau qui utilisent "
-"également ce service."
-
-#: C/create-account.page:85(p)
-msgid "For more information, see <link xref=\"salut-protocol\"/>."
-msgstr "Pour plus d'informations, consultez <link xref=\"salut-protocol\"/>."
-
-#: C/create-account.page:89(title) C/audio-video.page:205(p)
-msgid "SIP"
-msgstr "SIP"
-
-#: C/create-account.page:91(p)
-msgid ""
-"SIP is an open system which allows users to have audio and video "
-"conversations over the Internet. You need to create an account with a SIP "
-"provider. You can communicate with all other SIP users, regardless of which "
-"SIP provider they use."
-msgstr ""
-"SIP est un système libre qui permet aux utilisateurs d'avoir des "
-"conversations audio et vidéo sur internet. Vous devez créer un compte avec "
-"un fournisseur SIP. Vous pouvez communiquer avec tous les autres "
-"utilisateurs, quel que soit le fournisseur SIP qu'ils utilisent."
-
-#: C/create-account.page:97(p)
-msgid ""
-"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
-"index.php?page=register\">Ekiga.net</link> service does not currently work "
-"with <app>Empathy</app>."
-msgstr ""
-"En raison de différences techniques, le service gratuit <link href=\"https://"
-"www.ekiga.net/index.php?page=register\">Ekiga.net</link> ne fonctionne "
-"actuellement pas avec <app>Empathy</app>."
-
-#: C/create-account.page:102(p)
-msgid ""
-"Some SIP providers allow you to call normal phones from your computer. "
-"Generally, you will need to subscribe to a paid service for this feature."
-msgstr ""
-"Certains fournisseurs SIP vous autorisent à passer des appels téléphoniques "
-"normaux à partir de votre ordinateur. En général, vous devez souscrire à un "
-"service payant pour cette fonctionnalité."
-
-#: C/create-account.page:107(title) C/audio-video.page:165(p)
-msgid "IRC"
-msgstr "IRC"
-
-#: C/create-account.page:109(p)
-msgid ""
-"You do not need to register for an account to use IRC. Although you specify "
-"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
-"is only established each time you connect. If another user is using the "
-"nickname, you will need to choose a new nickname."
-msgstr ""
-"Il n'est pas nécessaire de s'inscrire à un compte pour utiliser IRC. Bien "
-"que vous deviez indiquer un pseudonyme lorsque vous ajoutez un compte IRC "
-"dans <app>Empathy</app>, ce pseudo n'est en vigueur que lorsque vous vous "
-"connectez. Si un autre utilisateur est en train d'utiliser le pseudo, vous "
-"devez en choisir un nouveau."
-
-#: C/create-account.page:114(p)
-msgid ""
-"Some IRC networks use a service called NickServ to allow users to protect "
-"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
+"To switch to <gui>Photo mode</gui>, click the small photo button in the "
+"bottom left of the window or click <guiseq><gui>Cheese</gui> <gui>Photo</"
+"gui></guiseq>."
 msgstr ""
-"Certains réseaux IRC utilisent un service appelé NickServ pour permettre aux "
-"utilisateurs de protéger leur pseudonyme. Consultez <link xref=\"irc-nick-"
-"password\"/> pour plus d'informations."
+"Pour passer au <gui>mode photo</gui>, cliquez sur le bouton contenant une "
+"petite photo en bas à gauche de la fenêtre ou cliquez sur "
+"<guiseq><gui>Cheese</gui> <gui>Photo</gui></guiseq>."
 
-#: C/create-account.page:117(p)
-msgid ""
-"Some IRC servers are password protected. You will need to know the password "
-"to connect to these servers. Generally, these are private IRC networks."
+#: C/photo-take.page:41(item/p)
+msgid "Click <gui>Take a Photo</gui> or press the <key>spacebar</key>."
 msgstr ""
-"Certains serveurs IRC sont protégés par mot de passe. Vous devez connaître "
-"le mot de passe pour vous connecter à ces serveurs. En général, ce sont des "
-"réseaux IRC privés."
-
-#: C/create-account.page:122(title)
-msgid "Proprietary Services"
-msgstr "Services propriétaires"
+"Cliquez sur <gui>Prendre une photo</gui> ou appuyez sur la <key>barre "
+"d'espace</key>."
 
-#: C/create-account.page:124(p)
+#: C/photo-take.page:44(item/p)
 msgid ""
-"There are many proprietary instant messaging services that have been "
-"developed by different companies or organizations. <app>Empathy</app> allows "
-"you to connect to an existing account for most popular services. To create a "
-"new account with one of these services, you will need to visit the service’s "
-"web site and agree to its terms of use."
+"There will be a short countdown, followed by a flash, and then the photo "
+"will appear in the photo stream at the bottom of the window."
 msgstr ""
-"Il y a de nombreux services de messagerie instantanée propriétaires qui ont "
-"été développés par différentes compagnies ou organisations. <app>Empathy</"
-"app> vous permet de vous connecter à un compte existant pour la plupart des "
-"services populaires. Pour créer un nouveau compte avec l'un de ces services, "
-"vous devez visiter le site Web du service et accepter les conditions "
-"d'utilisation."
-
-#: C/create-account.page:133(link) C/audio-video.page:135(p)
-msgid "AIM"
-msgstr "AIM"
-
-#: C/create-account.page:138(link) C/audio-video.page:160(p)
-msgid "ICQ"
-msgstr "ICQ"
-
-#: C/create-account.page:143(link) C/audio-video.page:175(p)
-msgid "MSN"
-msgstr "MSN"
+"Un court retardateur est affiché, suivi d'un flash, puis la photo apparaît "
+"dans le flux d'images en bas de la fenêtre."
 
-#: C/create-account.page:148(link) C/audio-video.page:210(p)
-msgid "Yahoo!"
-msgstr "Yahoo!"
-
-#: C/change-status.page:9(desc)
-msgid "Change your status to advertise your availability to your contacts."
-msgstr "Modifier son statut pour prévenir vos contacts de votre disponibilité."
-
-#: C/change-status.page:39(title)
-msgid "Change your status"
-msgstr "Modification de votre statut"
-
-#: C/change-status.page:41(p)
+#: C/photo-take.page:49(page/p)
 msgid ""
-"You can set your status to indicate your availability to your contacts. "
-"<app>Empathy</app> allows you to select from a list of defined statuses."
+"The photos in the photo stream are automatically saved in the "
+"<guiseq><gui>Pictures</gui><gui>Webcam</gui></guiseq> folder in your user "
+"folder. They are saved in the JPEG (<file>.jpg</file>) format."
 msgstr ""
-"Vous pouvez modifier votre statut pour indiquer à vos contacts votre "
-"disponibilité. <app>Empathy</app> vous permet de choisir dans une liste de "
-"statuts définis."
+"Les photos du flux d'images sont automatiquement enregistrées dans le "
+"dossier <guiseq><gui>Images</gui><gui>Webcam</gui></guiseq> de votre dossier "
+"personnel. Elles sont enregistrées dans le format JPEG (<file>.jpg</file>)."
 
-#: C/change-status.page:46(p)
+#: C/photo-take.page:53(page/p)
 msgid ""
-"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
+"To cancel taking a photo after you have clicked <gui>Take a Photo</gui>, "
+"press <key>Esc</key> before the countdown finishes."
 msgstr ""
-"Cliquez sur la liste déroulante au sommet de la fenêtre <gui>Liste des "
-"contacts</gui>."
+"Pour annuler la prise d'une photo après avoir cliqué sur <gui>Prendre une "
+"photo</gui>, appuyez sur la touche <key>Échap</key> avant la fin du "
+"retardateur."
 
-#: C/change-status.page:51(p)
-msgid "Select a status from the list."
-msgstr "Choisissez un statut dans la liste."
-
-#: C/change-status.page:57(p)
+#: C/photo-take.page:57(note/p)
 msgid ""
-"See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
-"what they mean. You can also <link xref=\"set-custom-status\">add custom "
-"status messages</link> to provide more information about your availability "
-"to your contacts."
+"To take multiple photos in rapid succession, use <link xref=\"burst-mode"
+"\">Burst mode</link>."
 msgstr ""
-"Consultez <link xref=\"status-icons\"/> pour obtenir la liste des statuts "
-"prédéfinis et leur signification. Vous pouvez également <link xref=\"set-"
-"custom-status\">ajouter des messages de statut personnalisé</link> pour "
-"donner plus d'informations à vos contacts sur votre disponibilité."
+"Pour prendre plusieurs photos les unes à la suite des autres, utilisez le "
+"<link xref=\"burst-mode\">mode rafale</link>."
 
-#: C/change-status.page:63(p)
-msgid ""
-"If you do not use your computer for a while, or if the screensaver is on, "
-"the status will be automatically set to Away."
+#: C/photo-view.page:19(info/desc)
+msgid "Photos and videos will automatically appear in the photo stream."
 msgstr ""
-"Si vous n'utilisez pas votre ordinateur pendant un certain temps ou si "
-"l'économiseur d'écran est en marche, le statut sera automatiquement "
-"paramétré à Absent."
+"Les photos et les vidéos apparaissent automatiquement dans le flux d'images."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/audio-video.page:58(None)
-msgid ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
-msgstr ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
+#: C/photo-view.page:23(page/title)
+msgid "View a photo or video that you took"
+msgstr "Affichage d'une photo ou d'une vidéo que vous avez faite"
 
-#: C/audio-video.page:8(desc)
+#: C/photo-view.page:25(page/p)
 msgid ""
-"Information on when it is possible to have an audio or video conversation."
+"After you take a photo or record a video, it will appear in the photo stream "
+"at the bottom of the window."
 msgstr ""
-"Informations sur les possibilités d'avoir une conversation audio ou vidéo."
-
-#: C/audio-video.page:32(title)
-msgid "Audio and video support"
-msgstr "Prise en charge de l'audio et de la vidéo"
+"Après avoir pris une photo ou enregistré une vidéo, elle apparaît dans le "
+"flux d'images en bas de la fenêtre."
 
-#: C/audio-video.page:34(p)
+#: C/photo-view.page:28(page/p)
 msgid ""
-"You can only have audio and video conversation with contacts who are using "
-"an application which also supports this feature. When your contacts support "
-"audio or video conversations, you will see the following icons next to their "
-"names in the contact list:"
+"If you want to see a bigger version of a photo, or to play a video, double-"
+"click it. This will open it in the default photo viewer or video player."
 msgstr ""
-"Vous ne pouvez avoir des conversations audio et vidéo avec des contacts qui "
-"utilisent une application qui prend également en charge cette fonction. "
-"Lorsque vos contacts prennent en charge les conversations audio ou vidéo, "
-"les icônes suivantes apparaissent à côté de leur nom dans la liste des "
-"contacts :"
-
-#: C/audio-video.page:43(p)
-msgid "Icon"
-msgstr "Icône"
-
-#: C/audio-video.page:48(p)
-msgid "Description"
-msgstr "Description"
+"Si vous souhaitez voir une version plus grande d'une photo ou lire une "
+"vidéo, double-cliquez dessus. Elle est alors ouverte dans le visionneur de "
+"photos ou le lecteur de vidéos par défaut."
 
-#: C/audio-video.page:58(media)
-msgid "Icon for audio conversation"
-msgstr "Icône pour une conversation audio"
-
-#: C/audio-video.page:64(p)
-msgid "The contact is able to have an audio conversation."
-msgstr "Le contact est capable d'avoir une conversation audio."
-
-#: C/audio-video.page:70(media)
-msgid "Icon for video conversation"
-msgstr "Icône pour une conversation vidéo"
-
-#: C/audio-video.page:76(p)
-msgid "The contact is able to have a video conversation."
-msgstr "Le contact est capable d'avoir une conversation vidéo."
-
-#: C/audio-video.page:83(p)
+#: C/photo-view.page:31(page/p)
 msgid ""
-"In order to have an audio conversation, you need to have a sound card that "
-"is supported by your operating system, and a working microphone."
+"All of the photos and videos in the photo stream are saved in the "
+"<guiseq><gui>Pictures</gui><gui>Webcam</gui></guiseq> or "
+"<guiseq><gui>Videos</gui><gui>Webcam</gui></guiseq> folders in your user "
+"folder."
 msgstr ""
-"Afin d'avoir une conversation audio, vous devez posséder une carte son prise "
-"en charge par votre système d'exploitation et un microphone qui fonctionne."
+"Toutes les photos et vidéos du flux d'images sont enregistrées dans les "
+"dossiers <guiseq><gui>Images</gui><gui>Webcam</gui></guiseq> ou "
+"<guiseq><gui>Vidéos</gui><gui>Webcam</gui></guiseq> de votre dossier "
+"personnel."
 
-#: C/audio-video.page:87(p)
+#: C/pref-burst-mode.page:19(info/desc)
 msgid ""
-"In order to have a video conversation, you need to have a webcam that is "
-"supported by your operating system, and a working microphone."
+"<gui>Burst mode</gui> takes several photos rapidly. Change your pose in "
+"between each shot!"
 msgstr ""
-"Afin d'avoir une conversation vidéo, vous devez posséder une webcam prise en "
-"charge par votre système d'exploitation et un microphone qui fonctionne."
-
-#: C/audio-video.page:95(title)
-msgid "Supported Account Types"
-msgstr "Types de comptes pris en charge"
+"Le <gui>mode rafale</gui> prend plusieurs photos rapidement. Changez de pose "
+"entre chaque prise !"
 
-#: C/audio-video.page:97(p)
-msgid ""
-"You can only have audio and video conversations using accounts on certain "
-"supported services. The following table lists whether audio and video is "
-"supported for each type of account."
-msgstr ""
-"Vous ne pouvez avoir des conversations audio et vidéo qu'en utilisant les "
-"comptes de certains services pris en charge. Le tableau suivant indique si "
-"l'audio et la vidéo sont pris en charge pour chaque type de compte."
+#: C/pref-burst-mode.page:23(page/title)
+msgid "Take multiple photos in quick succession"
+msgstr "Prise de plusieurs photos les unes à la suite des autres"
 
-#: C/audio-video.page:102(p)
+#: C/pref-burst-mode.page:25(page/p)
 msgid ""
-"Account types are provided by plugins. Your system may not have all of the "
-"following types available, or it may have types not listed here. Updated "
-"plugins may make audio or video conversations possible on account types that "
-"are listed as unsupported here."
+"You can use <gui>Burst mode</gui> to automatically take several photos in "
+"one go, with a short pause between shots. It is particularly fun if you "
+"change your pose in between photos! To use <gui>Burst mode</gui>:"
 msgstr ""
-"Les types de comptes sont fournis par des greffons. Il se peut que votre "
-"système n'ait pas tous les types disponibles ou que certains types ne soient "
-"pas listés ici. Des greffons mis à jour peuvent rendre possible les "
-"conversations audio ou vidéo avec des types de comptes qui sont affichés "
-"comme ne les prenant pas en charge ici."
+"Vous pouvez utiliser le <gui>mode rafale</gui> pour prendre plusieurs photos "
+"d'un coup, avec un court temps de pause entre elles. C'est particulièrement "
+"amusant si vous changez de pose entre les prises ! Pour utiliser le "
+"<gui>mode rafale</gui> :"
 
-#: C/audio-video.page:110(p)
+#: C/pref-burst-mode.page:31(item/p)
 msgid ""
-"I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
-"need to look at the accessibility impact. I've <link href=\"http://mail."
-"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
-"accessibility team</link> for input."
+"Click <gui>Burst</gui>, the <gui>Take a Photo</gui> button will now say "
+"<gui>Take Multiple Photos</gui>."
 msgstr ""
-"J'aimerais faire un tableau comme cela en utilisant rien pour Non et ✔ pour "
-"Oui mais il faut que nous regardions l'impact sur l'accessibilité. J'ai "
-"<link href=\"http://mail.gnome.org/archives/gnome-doc-list/2009-September/"
-"msg00006.html\"> posé la question à l'équipe d'accessibilité</link> pour "
-"avoir des infos."
-
-#: C/audio-video.page:118(p)
-msgid ""
-"There's recent work on telepathy-butterfly and papyon to support audio and "
-"video for MSN. It might be released in time for 2.28, but since it doesn't "
-"follow the Gnome release schedule, I can't be sure. If it looks like it's "
-"going to ship, let's mark it Yes."
-msgstr ""
-"Il y a des travaux récents sur telepathy-butterfly et papyon pour prendre en "
-"charge l'audio et la vidéo pour MSN. Il se peut qu'ils soient prêts à temps "
-"pour 2.28 mais comme cela ne suit pas le planning de réalisation de GNOME, "
-"je ne peux être sûr. Si cela a l'air d'être mis en place, alors marquons Oui."
-
-#: C/audio-video.page:128(p)
-msgid "Service"
-msgstr "Service"
-
-#: C/audio-video.page:129(p)
-msgid "Audio"
-msgstr "Audio"
-
-#: C/audio-video.page:130(p)
-msgid "Video"
-msgstr "Vidéo"
-
-#: C/audio-video.page:136(p) C/audio-video.page:137(p)
-#: C/audio-video.page:141(p) C/audio-video.page:142(p)
-#: C/audio-video.page:146(p) C/audio-video.page:147(p)
-#: C/audio-video.page:156(p) C/audio-video.page:157(p)
-#: C/audio-video.page:161(p) C/audio-video.page:162(p)
-#: C/audio-video.page:166(p) C/audio-video.page:167(p)
-#: C/audio-video.page:181(p) C/audio-video.page:182(p)
-#: C/audio-video.page:186(p) C/audio-video.page:187(p)
-#: C/audio-video.page:191(p) C/audio-video.page:192(p)
-#: C/audio-video.page:196(p) C/audio-video.page:197(p)
-#: C/audio-video.page:201(p) C/audio-video.page:202(p)
-#: C/audio-video.page:211(p) C/audio-video.page:212(p)
-#: C/audio-video.page:216(p) C/audio-video.page:217(p)
-msgid "No"
-msgstr "Non"
-
-#: C/audio-video.page:140(p)
-msgid "Facebook Chat"
-msgstr "Conversation Facebook"
-
-#: C/audio-video.page:145(p)
-msgid "gadugadu"
-msgstr "gadugadu"
+"Cliquez sur <gui>Rafale</gui>. Le bouton <gui>Prendre une photo</gui> "
+"devient <gui>Prendre plusieurs photos</gui>."
 
-#: C/audio-video.page:150(p)
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: C/audio-video.page:151(p) C/audio-video.page:152(p)
-#: C/audio-video.page:171(p) C/audio-video.page:172(p)
-#: C/audio-video.page:176(p) C/audio-video.page:177(p)
-#: C/audio-video.page:206(p) C/audio-video.page:207(p)
-msgid "Yes"
-msgstr "Oui"
-
-#: C/audio-video.page:155(p)
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: C/audio-video.page:180(p)
-msgid "myspace"
-msgstr "myspace"
-
-#: C/audio-video.page:185(p)
-msgid "qq"
-msgstr "qq"
-
-#: C/audio-video.page:195(p)
-msgid "sametime"
-msgstr "sametime"
-
-#: C/audio-video.page:200(p)
-msgid "silc"
-msgstr "silc"
-
-#: C/audio-video.page:215(p)
-msgid "zephyr"
-msgstr "zephyr"
-
-#: C/audio-call.page:9(desc)
-msgid "Call your contacts over the Internet."
-msgstr "Appeler vos contacts sur internet."
-
-#: C/audio-call.page:27(title)
-msgid "Start an audio conversation"
-msgstr "Lancement d'une conversation audio"
-
-#: C/audio-call.page:29(p)
-msgid ""
-"You can call your contacts and have an audio conversation with them. This "
-"features only works with certain types of accounts, and it requires the "
-"other person to have an application that supports audio calls."
-msgstr ""
-"Vous pouvez appeler vos contacts et avoir des conversations audio avec eux. "
-"Cette fonctionnalité ne fonctionne qu'avec certains types de comptes et il "
-"est nécessaire pour l'autre personne d'avoir une application qui prend en "
-"charge les appels audio."
-
-#: C/audio-call.page:34(p)
-msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
-"next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Audio Call</gui>."
-msgstr ""
-"À partir de la fenêtre <gui>Liste des contacts</gui>, cliquez sur l'icône "
-"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png"
-"\">Appel vidéo</media> à côté du contact que vous souhaitez appeler et "
-"choisissez <gui style=\"menuitem\">Appel audio</gui>."
-
-#: C/audio-call.page:55(p)
-msgid ""
-"To turn an audio conversation into a video conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
-msgstr ""
-"Pour transformer un appel audio en conversation vidéo, choisissez "
-"<guiseq><gui style=\"menu\">Vidéo</gui><gui style=\"menuitem\">Vidéo "
-"activée</gui></guiseq>."
-
-#: C/audio-call.page:63(title)
-msgid "Start an audio conversation with a meta-contact"
-msgstr "Lancement d'une conversation audio avec un méta-contact"
-
-#: C/audio-call.page:71(p)
+#: C/pref-burst-mode.page:33(item/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Audio Call</gui>."
-msgstr ""
-"Sélectionnez le contact avec lequel vous voulez discuter et choisissez <gui "
-"style=\"menuitem\">Appel audio</gui> dans le menu."
-
-#: C/add-contact.page:9(desc)
-msgid "Add someone to the contact list."
-msgstr "Ajouter quelqu'un à la liste des contacts."
-
-#: C/add-contact.page:33(title)
-msgid "Add someone to your list of contacts"
-msgstr "Ajout d'une personne à votre liste de contacts"
-
-#: C/add-contact.page:37(p)
-msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+"Alternatively, click <guiseq><gui>Cheese</gui><gui>Burst</gui></guiseq>."
 msgstr ""
-"Choisissez <guiseq><gui>Discussion</gui><gui>Ajouter un contact</gui></"
+"Vous pouvez aussi cliquer sur <guiseq><gui>Cheese</gui><gui>Rafale</gui></"
 "guiseq>."
 
-#: C/add-contact.page:40(p)
-msgid ""
-"From the <gui>Account</gui> drop-down list, select the account you wish to "
-"use to connect to your contact. Your contact will need to be using the same "
-"service as the account you select."
+#: C/pref-burst-mode.page:36(item/p)
+msgid "Click <gui>Take Multiple Photos</gui> or press the <key>spacebar</key>."
 msgstr ""
-"À partir de la liste déroulante <gui>Compte</gui>, choisissez le compte que "
-"vous souhaitez utiliser pour contacter votre contact. Votre contact devra "
-"utiliser le même service que le compte sélectionné."
+"Cliquez sur <gui>Prendre plusieurs photos</gui> ou appuyez sur la <key>barre "
+"d'espace</key>."
 
-#: C/add-contact.page:45(p)
+#: C/pref-burst-mode.page:38(item/p)
 msgid ""
-"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
-"screen name, or other appropriate identifier for the service type."
+"By default, four photos will be taken, with a three second delay and a "
+"countdown between photos."
 msgstr ""
-"Dans le champ <gui>Identifiant</gui>, saisissez l'identifiant de connexion "
-"de votre contact, son nom d'utilisateur, son nom d'écran ou d'autres "
-"identifiants appropriés pour le type de service."
+"Par défaut, quatre photos sont prises, avec, entre chaque photo, un délai de "
+"trois secondes et un compte à rebours."
 
-#: C/add-contact.page:49(p)
+#: C/pref-burst-mode.page:43(page/p)
 msgid ""
-"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
-"to appear in your contact list."
+"Press <key>Esc</key> if you want to stop <app>Cheese</app> from taking "
+"photos at any point."
 msgstr ""
-"Dans le champ <gui>Alias</gui>, saisissez le nom de votre contact comme vous "
-"souhaitez le voir apparaître dans votre liste des contacts."
+"Appuyez sur la touche <key>Échap</key> quand vous le souhaitez, si vous "
+"voulez que <app>Cheese</app> arrête de prendre des photos."
 
-#: C/add-contact.page:53(p)
-msgid "Click <gui>Add</gui> to add the person to your list of contacts."
-msgstr ""
-"Cliquez sur <gui>Ajouter</gui> pour ajouter la personne dans votre liste de "
-"contacts."
+#: C/pref-burst-mode.page:47(section/title)
+msgid "Change how many photos are taken and the delay between them"
+msgstr "Modification du nombre de photos prises et du délai entre elles"
 
-#: C/add-contact.page:61(p)
+#: C/pref-burst-mode.page:48(section/p)
 msgid ""
-"To add a new person to your list of contacts, you need to be connected to "
-"the Internet and to your account."
+"You can change how many photos will be taken in each burst and the length of "
+"the delay between the photos:"
 msgstr ""
-"Pour ajouter une nouvelle personne à votre liste de contacts, vous devez "
-"être connecté à internet et à votre compte."
-
-#: C/add-account.page:9(desc)
-msgid "Add a new account to <app>Empathy</app>."
-msgstr "Ajouter un nouveau compte à <app>Empathy</app>."
+"Vous pouvez changer le nombre de photos à prendre à chaque rafale et la "
+"durée du délai entre les photos :"
 
-#: C/add-account.page:40(title)
-msgid "Add a new account"
-msgstr "Ajout d'un nouveau compte"
+#: C/pref-burst-mode.page:52(item/p) C/pref-image-properties.page:30(item/p)
+#: C/pref-photo-resolution.page:36(item/p)
+msgid "Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+msgstr "Cliquez sur <guiseq><gui>Édition</gui><gui>Préférences</gui></guiseq>."
 
-#: C/add-account.page:42(p)
+#: C/pref-burst-mode.page:55(item/p)
 msgid ""
-"You can add instant messaging accounts from any supported service to "
-"communicate with all of your contacts in <app>Empathy</app>. For some "
-"account providers, these steps will also allow you to register for a new "
-"account. For more details, see <link xref=\"create-account\"/>."
+"Change the options under <gui>Burst mode</gui> and click <gui>Close</gui>."
 msgstr ""
-"Vous pouvez ajouter des comptes de messagerie instantanée de n'importe quel "
-"service pris en charge pour communiquer avec tous vos contacts dans "
-"<app>Empathy</app>. Pour certains fournisseurs de compte, ces étapes vous "
-"permettront également de vous inscrire sur un nouveau compte. Pour plus de "
-"détails, consultez <link xref=\"create-account\"/>."
-
-#: C/add-account.page:53(p)
-msgid "Click <gui style=\"button\">+</gui>."
-msgstr "Cliquez sur le bouton <gui style=\"button\">+</gui>."
+"Modifiez les options sous <gui>Mode rafale</gui> et cliquez sur <gui>Fermer</"
+"gui>."
 
-#: C/add-account.page:58(p)
+#: C/pref-burst-mode.page:59(note/p)
 msgid ""
-"From the <gui>Protocol</gui> drop-down list, select the type of account you "
-"wish to add."
+"The delay is between the last photo taken and the start of the countdown for "
+"the next photo, not between two photos."
 msgstr ""
-"Dans la liste déroulante <gui>Protocole</gui>, sélectionnez le type de "
-"compte que vous voulez ajouter."
+"Le délai est celui entre la dernière prise de photo et le début du compte à "
+"rebours pour la photo suivante et non pas celui entre deux photos."
 
-#: C/add-account.page:62(p)
-msgid ""
-"If you do not already have a registered account, select <gui>Create a new "
-"account on the server</gui>. This feature is not available for all account "
-"types, and may not work with some account providers. See <link xref=\"create-"
-"account\"/> for more information."
+#: C/pref-countdown.page:19(info/desc)
+msgid "Remove the countdown so that photos are taken instantly."
 msgstr ""
-"Si vous ne vous êtes pas déjà inscrit sur un compte, choisissez <gui>Créer "
-"un nouveau compte sur le serveur</gui>. Cette fonctionnalité n'est pas "
-"disponible pour tous les types de compte et il se peut que cela ne "
-"fonctionne pas avec certains fournisseurs de compte. Consultez <link xref="
-"\"create-account\"/> pour plus d'informations."
+"Enlever le compte à rebours pour que les photos soient prises instantanément."
 
-#: C/add-account.page:69(p)
-msgid ""
-"Enter the required information. For most accounts, you will only need a "
-"login ID and a password. Some accounts may require additional information. "
-"See <link xref=\"accounts-window#details\"/>for more information."
-msgstr ""
-"Saisissez les informations requises. Pour la plupart des comptes, vous "
-"n'aurez besoin que d'un identifiant de connexion et d'un mot de passe. Il se "
-"peut que certains comptes requièrent plus d'informations. Consultez <link "
-"xref=\"accounts-window#details\"/> pour plus d'informations."
+#: C/pref-countdown.page:22(page/title)
+msgid "Disable the <gui>Countdown</gui> before photos are taken"
+msgstr "Désactivation du <gui>retardateur</gui> avant la prise des photos"
 
-#: C/add-account.page:81(p)
+#: C/pref-countdown.page:24(page/p)
 msgid ""
-"To change the name that identifies the account in the <gui>Accounts</gui> "
-"window, select the account from the list on the left and either click on the "
-"name or press the space bar. Edit the account name and press <key>Enter</"
-"key> when you’re finished."
+"By default, <app>Cheese</app> counts down from three before taking a photo. "
+"You can disable this feature by clicking <guiseq><gui>Edit</gui> "
+"<gui>Preferences</gui></guiseq> and unchecking <gui>Countdown</gui>."
 msgstr ""
-"Pour modifier le nom qui identifie le compte dans la fenêtre <gui>Comptes</"
-"gui>, sélectionnez le compte dans la liste sur la gauche et soit vous "
-"cliquez sur le nom, soit vous appuyez sur la barre d'espace. Modifiez le nom "
-"du compte et appuyez sur <key>Entrée</key> lorsque vous avez terminé."
+"Par défaut, <app>Cheese</app> affiche un compte à rebours de trois secondes "
+"avant de prendre une photo. Vous pouvez l'empêcher en cliquant sur "
+"<guiseq><gui>Édition</gui> <gui>Préférences</gui></guiseq> et en décochant "
+"<gui>Retardateur</gui>."
 
-#: C/accounts-window.page:11(desc)
-msgid "Add, modify, and delete accounts."
-msgstr "Ajouter, modifier et supprimer des comptes."
+#: C/pref-flash.page:18(info/desc)
+msgid "Stop the screen from flashing white when taking a photo."
+msgstr "Enlever le flash de l'écran lors de la prise de photos."
 
-#: C/accounts-window.page:33(title)
-msgid "Accounts Window"
-msgstr "Fenêtre Comptes"
+#: C/pref-flash.page:21(page/title)
+msgid "Disable the flash"
+msgstr "Désactivation du flash"
 
-#: C/accounts-window.page:35(p)
+#: C/pref-flash.page:23(page/p)
 msgid ""
-"The <gui>Accounts</gui> window allows you to add, modify, and delete "
-"accounts."
+"When you take a photo with Cheese, the computer screen briefly turns white. "
+"This provides additional light."
 msgstr ""
-"La fenêtre <gui>Comptes</gui> vous permet d'ajouter, de modifier et de "
-"supprimer des comptes."
-
-#: C/accounts-window.page:43(title)
-msgid "Account Details"
-msgstr "Détails de compte"
+"Quand vous prenez une photos avec Cheese, l'écran de l'ordinateur devient "
+"blanc un court instant, ce qui augmente la lumière."
 
-#: C/accounts-window.page:44(p)
+#: C/pref-flash.page:26(page/p)
 msgid ""
-"For most types of accounts, you can simply enter a login ID and a password. "
-"Certain accounts or account types, however, may require additional "
-"information."
+"To disable this feature, click <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui></guiseq> and uncheck <gui>Fire Flash</gui>."
 msgstr ""
-"Pour la plupart des comptes, vous pouvez simplement saisir un identifiant de "
-"compte et un mot de passe. Il se peut que certains comptes ou types de "
-"compte requièrent cependant des informations supplémentaires."
-
-#: C/account-jabber.page:7(desc)
-msgid "Advanced options for Jabber and Google Talk accounts."
-msgstr "Options avancées pour les comptes Jabber et Google Talk."
-
-#: C/account-jabber.page:29(title)
-msgid "Jabber account details"
-msgstr "Détails de compte Jabber"
+"Pour désactiver cette fonctionnalité, cliquez sur <guiseq><gui>Édition</"
+"gui><gui>Préférences</gui></guiseq> et décochez <gui>Utiliser le flash</gui>."
 
-#: C/account-jabber.page:31(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/pref-image-properties.page:45(media)
+msgctxt "_"
 msgid ""
-"Most Jabber accounts will require only a login ID and a password to connect. "
-"For some accounts or on certain types of networks, you may need to enter "
-"additional information in the <gui>Advanced</gui> section. Normally, you "
-"will not need to use the advanced options below. For general instructions on "
-"adding an account, see <link xref=\"add-account\"/>."
+"external ref='figures/image-properties.png' "
+"md5='70c32a1dd7c9a20dabef58d0789f2a5a'"
 msgstr ""
-"La plupart des comptes Jabber ne requiert qu'un identifiant de connexion et "
-"un mot de passe pour se connecter. Pour certains comptes ou certains types "
-"de réseau, il se peut que vous deviez saisir des informations "
-"supplémentaires dans la section <gui>Avancé</gui>. Normalement vous ne "
-"devriez pas avoir à utiliser les options avancées ci-dessous. Pour obtenir "
-"des instructions générales sur l'ajout d'un compte, consultez <link xref="
-"\"add-account\"/>."
+"external ref='figures/image-properties.png' "
+"md5='70c32a1dd7c9a20dabef58d0789f2a5a'"
 
-#: C/account-jabber.page:39(p)
+#: C/pref-image-properties.page:19(info/desc)
 msgid ""
-"Google Talk is a type of Jabber account. These instructions hold for Google "
-"Talk accounts as well."
+"Adjust the saturation, contrast, brightness and hue to make photos and "
+"videos look better."
 msgstr ""
-"Google Talk est un compte de type Jabber. Ces instructions valent donc "
-"également pour les comptes Google Talk."
+"Ajuster la saturation, le contraste, la luminosité et la teinte pour "
+"améliorer vos photos et vos vidéos."
 
-#: C/account-jabber.page:45(gui)
-msgid "Encryption required (TLS/SSL)"
-msgstr "Chiffrement requis (TLS/SSL)"
+#: C/pref-image-properties.page:23(page/title)
+msgid "My photos and videos look wrong"
+msgstr "Mes photos et vidéos n'ont pas l'air normales"
 
-#: C/account-jabber.page:46(gui)
-msgid "Ignore SSL certificate errors"
-msgstr "Ignorer les erreurs de certificat SSL"
-
-#: C/account-jabber.page:47(p)
+#: C/pref-image-properties.page:25(page/p)
 msgid ""
-"Whenever possible, communication between <app>Empathy</app> and the Jabber "
-"server is encrypted. If encrypted communication is not possible, messages "
-"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
-"<app>Empathy</app> from communicating with the Jabber server when encryption "
-"is not possible."
+"If your photos or videos are too dark or the colors seem to be wrong, try "
+"adjusting their saturation, contrast, brightness and hue:"
 msgstr ""
-"Lorsque c'est possible, la communication entre <app>Empathy</app> et le "
-"serveur Jabber est chiffrée. Si la communication chiffrée n'est pas "
-"possible, il se peut que les messages ne soient pas chiffrées. Sélectionnez "
-"<gui>Chiffrement requis</gui> pour empêcher <app>Empathy</app> de "
-"communiquer avec le serveur Jabber lorsque le chiffrement n'est pas possible."
+"Si vos photos ou vos vidéos sont trop sombres ou si les couleurs ont l'air "
+"fausses, essayez d'ajuster la saturation, le contraste, la luminosité et la "
+"teinte :"
 
-#: C/account-jabber.page:52(p)
+#: C/pref-image-properties.page:33(item/p)
 msgid ""
-"Some Jabber servers may encrypt data using invalid certificates, or using "
-"certificates from unknown authorities. If you trust the server you are "
-"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
-"allow encrypted communication with invalid certificates."
+"Under <gui>Image properties</gui>, change the sliders to find the best "
+"settings for your webcam."
 msgstr ""
-"Il se peut que certains serveurs Jabber chiffrent les données en utilisant "
-"des certificats non valides ou en utilisant des certificats d'autorités "
-"inconnues. Si vous faites confiance dans le serveur auquel vous êtes "
-"connectés, vous pouvez sélectionner <gui>Ignorer les erreurs de certificat "
-"SSL</gui> pour autoriser la communication chiffrée avec des certificats non "
-"valides."
-
-#: C/account-jabber.page:59(gui)
-msgid "Resource"
-msgstr "Ressource"
-
-#: C/account-jabber.page:60(gui)
-msgid "Priority"
-msgstr "Priorité"
+"Sous <gui>Propriétés de l'image</gui>, modifiez les positions des glissières "
+"pour trouver les meilleurs réglages pour votre webcam."
 
-#: C/account-jabber.page:61(p)
+#: C/pref-image-properties.page:37(item/p)
 msgid ""
-"If you have multiple applications (for instance, on separate computers) "
-"connected to your account at the same time, you can set a resource to "
-"uniquely identify each one. By default, <app>Empathy</app> will use "
-"<input>Telepathy</input> as the resource."
+"Click <gui>Close</gui> and check to see if the photos and videos look better."
 msgstr ""
-"Si plusieurs applications (par exemple, sur des ordinateurs différents) sont "
-"connectées à votre compte en même temps, vous pouvez définir une ressource "
-"pour identifier chacun d'eux de manière unique. Par défaut, <app>Empathy</"
-"app> utilise <input>Telepathy</input> comme ressource."
+"Cliquez sur <gui>Fermer</gui> et vérifiez que les photos et les vidéos sont "
+"meilleures."
 
-#: C/account-jabber.page:65(p)
+#: C/pref-image-properties.page:43(figure/title)
 msgid ""
-"You can set the priority to specify which application should receive "
-"incoming messages from your contacts. New messages will be sent to the "
-"application with the highest priority."
+"Different options under <gui>Image properties</gui> (left to right): "
+"applying brightness, contrast, hue and saturation"
 msgstr ""
-"Vous pouvez définir une priorité pour indiquer quelles applications doit "
-"recevoir les messages entrants de vos contacts. Les nouveaux messages seront "
-"envoyés à l'application qui possède la plus haute priorité."
+"Différentes options dans <gui>Propriétés de l'image</gui> (de gauche à "
+"droite) : modification de la luminosité, du contraste, de la teinte et de la "
+"saturation"
 
-#: C/account-jabber.page:70(gui)
-msgid "Override server settings"
-msgstr "Neutralisation des réglages de serveur "
+#: C/pref-image-properties.page:50(item/title)
+msgid "Brightness"
+msgstr "Luminosité"
 
-#: C/account-jabber.page:71(p)
+#: C/pref-image-properties.page:51(item/p)
 msgid ""
-"<app>Empathy</app> will use default settings to connect to the Jabber server "
-"based on your login ID. For some Jabber servers, you will need to enter "
-"custom server settings manually. These settings should be provided for you "
-"by your Jabber provider."
-msgstr ""
-"<app>Empathy</app> utilise les paramètres par défaut pour se connecter au "
-"serveur Jabber en fonction de votre identifiant de connexion. Pour certains "
-"serveurs Jabber, vous devez saisir des paramètres de serveur personnalisés "
-"manuellement. Ces réglages vous sont fournis par votre fournisseur Jabber."
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:106(None)
-msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
-msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:112(None)
-msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+"Increasing the brightness will make the photos and videos lighter. However, "
+"if you are in a dark room, increasing the brightness might make the image "
+"look more noisy."
 msgstr ""
-"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
-
-#: C/account-irc.page:8(desc)
-msgid "Additional information necessary for connecting to IRC networks."
-msgstr "Informations supplémentaires utiles pour se connecter aux réseaux IRC."
-
-#: C/account-irc.page:31(title)
-msgid "IRC account details"
-msgstr "Détails de comptes IRC"
+"Augmenter la luminosité rend la photo et la vidéo plus lumineuse. Cependant, "
+"si vous êtes dans une pièce sombre, augmenter la luminosité augmente le "
+"grain de l'image."
 
-#: C/account-irc.page:33(p)
-msgid ""
-"IRC accounts require different information than many other types of "
-"accounts. To create an IRC account, you must specify at least an IRC network "
-"and a nickname. This page details the information you can provide for an IRC "
-"account."
-msgstr ""
-"Les comptes IRC ont besoin d'informations différentes des autres types de "
-"comptes. Pour créer un compte IRC, vous devez indiquer au moins un réseau "
-"IRC et un pseudonyme. Cette page détaille les informations que vous pouvez "
-"fournir pour un compte IRC."
+#: C/pref-image-properties.page:54(item/title)
+msgid "Contrast"
+msgstr "Contraste"
 
-#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
-msgid "Network"
-msgstr "Réseau"
-
-#: C/account-irc.page:46(p)
+#: C/pref-image-properties.page:55(item/p)
 msgid ""
-"IRC is an open system that allows people to run separate IRC networks. Each "
-"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
-"lists the most popular networks in the <gui>Network</gui> drop-down list. "
-"You can add additional networks. See <link xref=\"#networks\"/> below."
+"Setting a higher contrast will increase the difference between darker and "
+"lighter colors. If the image looks washed out, try increasing the contrast."
 msgstr ""
-"IRC est un système ouvert qui permet aux gens de lancer des réseaux "
-"IRC distincts. Chaque réseau est différent et possède ses propres "
-"utilisateurs et salons de discussion. <app>Empathy</app> affiche les réseaux "
-"les plus populaires dans la liste déroulante <gui>Réseau</gui>. Vous pouvez "
-"ajouter d'autres réseaux. Consultez <link xref=\"#networks\"/> ci-dessous."
+"Utiliser un fort contraste augmente la différence entre les couleurs sombres "
+"et claires. Si l'image a l'air délavée, essayez d'augmenter le contraste."
 
-#: C/account-irc.page:53(gui)
-msgid "Nickname"
-msgstr "Pseudonyme"
+#: C/pref-image-properties.page:58(item/title)
+msgid "Hue"
+msgstr "Teinte"
 
-#: C/account-irc.page:54(p)
+#: C/pref-image-properties.page:59(item/p)
 msgid ""
-"Your nickname is your unique name on the IRC network. Only one person on a "
-"network may use a given nickname. If you get an error message that says "
-"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change "
-"your nickname."
+"Changing the hue of the image will add a tint to it. If image seems to be "
+"the wrong color (for example, too yellow), try changing the hue."
 msgstr ""
-"Votre pseudonyme est un nom unique sur le réseau IRC. Seul une personne sur "
-"un réseau peut utiliser un pseudonyme donné. Si vous obtenez un message "
-"d'erreur qui indique <link xref=\"prob-conn-name\" role=\"error-msg\"/>, "
-"vous devez modifier votre pseudonyme."
+"Modifier la teinte de l'image lui ajoute une couleur particulière. Si les "
+"couleurs de l'image semblent fausses (par exemple, trop de jaune), essayez "
+"de changer la teinte."
 
-#: C/account-irc.page:60(gui)
-msgid "Password"
-msgstr "Mot de passe"
+#: C/pref-image-properties.page:62(item/title)
+msgid "Saturation"
+msgstr "Saturation"
 
-#: C/account-irc.page:61(p)
+#: C/pref-image-properties.page:63(item/p)
 msgid ""
-"Some servers, particularly those on private networks, require a password to "
-"connect. If you are authorized to use the network, the network "
-"administrators should provide you with a password."
+"Reducing the saturation makes the image less colorful. If colors seem too "
+"harsh, reduce the saturation."
 msgstr ""
-"Certains serveurs, plus particulièrement ceux des réseaux privés, exigent un "
-"mot de passe pour se connecter. Si vous êtes autorisé à utiliser le réseau, "
-"les administrateurs du réseau doivent vous fournir un mot de passe."
-
-#: C/account-irc.page:65(title)
-msgid "NickServ Passwords"
-msgstr "Mots de passe NickServ"
+"Réduire la saturation rend l'image moins colorée. Si les couleurs semblent "
+"trop accentuées, réduisez la saturation."
 
-#: C/account-irc.page:66(p)
+#: C/pref-photo-resolution.page:19(info/desc)
 msgid ""
-"On some networks, nicknames can be registered using a service known as "
-"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
-"On some networks, including the popular freenode network, server passwords "
-"are automatically forwarded to NickServ, allowing you to set this field to "
-"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
-"more details."
+"The resolution of a video or photo determines how much detail you can see in "
+"it, changing it will affect the file size."
 msgstr ""
-"Sur certains réseaux, les pseudonymes peuvent être inscrits en utilisant un "
-"service connu sous le nom de NickServ. <app>Empathy</app> ne prend pas "
-"directement en charge les mots de passe de pseudonyme. Sur certains réseaux, "
-"dont le populaire réseau freeNode, les mots de passe de serveur sont "
-"automatiquement envoyés à NickServ ce qui vous permet de paramétrer ce champ "
-"pour vous identifier avec NickServ. Consultez <link xref=\"irc-nick-password"
-"\"/> pour plus de détails."
+"La résolution d'une vidéo ou d'une photo détermine la quantité de détails "
+"qu'elle contient ; la modifier affecte la taille du fichier."
 
-#: C/account-irc.page:76(gui)
-msgid "Real name"
-msgstr "Nom réel"
+#: C/pref-photo-resolution.page:24(page/title)
+msgid "Change the capture resolution of your webcam"
+msgstr "Modification de la résolution de capture de votre webcam"
 
-#: C/account-irc.page:77(p)
+#: C/pref-photo-resolution.page:26(page/p)
 msgid ""
-"You can provide your real name in addition to your nickname. Other users "
-"will be able to see this when they view your information."
+"Higher resolution generally means better quality images, but photos and "
+"videos with higher resolution take up more space on your hard disk. High "
+"resolution videos, in particular, take up a lot of space."
 msgstr ""
-"Vous pouvez fournir votre véritable nom en plus de votre pseudonyme. Les "
-"autres utilisateurs seront capables de le voir lorsqu'ils consultent vos "
-"informations."
-
-#: C/account-irc.page:81(gui)
-msgid "Quit message"
-msgstr "Message de départ"
+"Une plus haute résolution permet généralement d'obtenir des images de "
+"meilleure qualité, mais les photos et les vidéos avec une plus haute "
+"résolution prennent plus de place sur le disque dur, particulièrement pour "
+"les vidéos."
 
-#: C/account-irc.page:82(p)
+#: C/pref-photo-resolution.page:30(page/p)
 msgid ""
-"When you go offline, a quit message is sent to all the chat rooms you’re in "
-"and to all the users you’re having a private conversation with. Use this "
-"field to provide a custom quit message."
+"If you want your images to take up less disk space, reduce the resolution of "
+"your webcam. If you want better quality images, increase the resolution. To "
+"change the webcam resolution:"
 msgstr ""
-"Lorsque vous quittez le réseau, un message de départ est envoyé à tout le "
-"salon de discussion dans lequel vous êtes et à tous les utilisateurs avec "
-"qui vous avez une conversation privée. Utilisez ce champ pour fournir un "
-"message de départ personnalisé."
+"Si vous voulez que vos photos prennent moins de place sur le disque, "
+"réduisez la résolution de votre webcam. Si vous voulez des images de "
+"meilleur qualité, augmentez la résolution. Pour modifier la résolution de la "
+"webcam :"
 
-#: C/account-irc.page:94(title)
-msgid "IRC Networks"
-msgstr "Réseaux IRC"
-
-#: C/account-irc.page:97(title)
-msgid "Networks"
-msgstr "Réseaux"
-
-#: C/account-irc.page:99(p)
+#: C/pref-photo-resolution.page:39(item/p)
 msgid ""
-"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
-"another IRC network, you can add it to the list. You can also modify "
-"networks and remove them from the list."
+"Choose a different resolution from the drop-down list. Some webcams only "
+"support one resolution, so you may not have a choice."
 msgstr ""
-"<app>Empathy</app> est fourni avec une liste des réseaux IRC populaires. Si "
-"vous désirez un autre réseau IRC, vous pouvez l'ajouter à la liste. Vous "
-"pouvez également modifier les réseaux et les supprimer de la liste."
+"Choisissez une résolution différente dans la liste déroulante. Certaines "
+"webcams ne prennent en charge qu'une seule résolution, il est donc possible "
+"que vous n'ayez pas le choix."
 
-#: C/account-irc.page:104(p)
-msgid ""
-"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
-"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
-msgstr ""
-"Pour ajouter un réseau à la liste, cliquez sur <media type=\"image\" mime="
-"\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16"
-"\">Ajouter</media>."
+#: C/pref-photo-resolution.page:43(item/p)
+msgid "Click <gui>Close</gui>."
+msgstr "Cliquez sur <gui>Fermer</gui>."
 
-#: C/account-irc.page:107(p)
-msgid ""
-"To modify a network in the list, select the network and click <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
-"height=\"16\">Edit</media>."
+#: C/video-record.page:19(info/desc)
+msgid "Use your webcam to record short movies for sharing with friends."
 msgstr ""
-"Pour modifier un réseau de la liste, sélectionnez le réseau et cliquez sur "
-"<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width="
-"\"16\" height=\"16\">Modifier</media>."
+"Utiliser sa webcam pour enregistrer des films courts pour les partager avec "
+"des amis."
 
-#: C/account-irc.page:110(p)
-msgid ""
-"To remove a network from the list, select the network and click <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
-"height=\"16\">Remove</media>."
-msgstr ""
-"Pour supprimer un réseau de la liste, sélectionnez le réseau et cliquez sur "
-"<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" "
-"width=\"16\" height=\"16\">Supprimer</media>."
+#: C/video-record.page:22(page/title)
+msgid "Record a video"
+msgstr "Enregistrement d'une vidéo"
 
-#: C/account-irc.page:115(p)
-msgid ""
-"When adding or modifying a network, you can enter the following information:"
-msgstr ""
-"Lorsque vous ajoutez ou modifiez un réseau, vous pouvez fournir les "
-"informations suivantes :"
+#: C/video-record.page:24(page/p)
+msgid "To record a video using your webcam:"
+msgstr "Pour enregistrer une vidéo à l'aide de votre webcam :"
 
-#: C/account-irc.page:121(p)
+#: C/video-record.page:28(item/p)
 msgid ""
-"This is the name of the network as you want it to appear in the list of "
-"networks."
+"Make sure that you are in <gui>Video mode</gui>. If you are, the button in "
+"the middle of the window will say <gui>Start Recording</gui>."
 msgstr ""
-"C'est le nom du réseau tel que vous souhaitez qu'il apparaisse dans la liste "
-"des réseaux."
-
-#: C/account-irc.page:125(gui)
-msgid "Charset"
-msgstr "Jeu de caractères"
+"Vérifiez que vous êtes dans le <gui>Mode vidéo</gui>. Si c'est le cas, le "
+"bouton de la fenêtre principale affiche <gui>Enregistrer une vidéo</gui>."
 
-#: C/account-irc.page:126(p)
+#: C/video-record.page:30(item/p)
 msgid ""
-"This specifies the character encoding that is typically used on this "
-"network. A character encoding is a specific way of recording characters "
-"internally in a computer. There are many character encodings, and you need "
-"to use the same character encoding as other users to see their messages "
-"correctly."
+"You can switch to <gui>Video mode</gui> by clicking the button in the main "
+"window or by clicking <guiseq><gui>Cheese</gui><gui>Video</gui></guiseq>."
 msgstr ""
-"Cela spécifie le codage de caractères qui est typiquement utilisé sur ce "
-"réseau. Un codage de caractères est une méthode spécifique pour enregistrer "
-"les caractères de manière interne dans l'ordinateur. Il y a de nombreux "
-"codages de caractères et vous devez utiliser le même codage de caractères "
-"que les autres utilisateurs pour lire leurs messages correctement."
+"Vous pouvez passer au <gui>mode vidéo</gui> en cliquant sur le bouton de la "
+"fenêtre principale ou en cliquant sur <guiseq><gui>Cheese</gui><gui>Vidéo</"
+"gui></guiseq>."
 
-#. Translators: Recommend character encodings that are common
-#.             for your language.
-#: C/account-irc.page:135(p)
+#: C/video-record.page:34(item/p)
 msgid ""
-"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
-"can handle text from most of the world's languages. Another common encoding "
-"for English and some other Western languages is ISO-8859-1."
+"Click <gui>Start Recording</gui>, or press the <key>spacebar</key>. "
+"<app>Cheese</app> will start recording from your webcam."
 msgstr ""
-"Par défaut, <app>Empathy</app> utilise UTF-8, un codage de caractère moderne "
-"qui peut gérer du texte de la plupart des langues du monde. Un autre codage "
-"courant pour les anglais et certaines autres langues de l'Europe de l'Ouest "
-"est l'ISO-8859-1."
-
-#: C/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "Serveurs"
+"Cliquez sur <gui>Enregistrer une vidéo</gui> ou appuyez sur la <key>barre "
+"d'espace</key>. <app>Cheese</app> démarre l'enregistrement avec votre webcam."
 
-#: C/account-irc.page:142(p)
+#: C/video-record.page:38(item/p)
 msgid ""
-"An IRC network may have many servers you can connect to. When you are "
-"connected to a server on a particular network, you can communicate with all "
-"users on all other servers on that network. You can add and remove servers "
-"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
+"To stop recording, click <gui>Stop Recording</gui> or press <key>Esc</key>."
 msgstr ""
-"Un réseau IRC peut posséder de nombreux serveurs auxquels vous pouvez vous "
-"connecter. Lorsque vous êtes connecté à un serveur sur un réseau "
-"particulier, vous pouvez communiquer avec tous les utilisateurs de tous les "
-"autres serveurs de ce réseau. Vous pouvez ajouter ou supprimer des serveurs "
-"pour ce réseau en utilisant les boutons <gui>Ajouter</gui> et "
-"<gui>Supprimer</gui>."
+"Pour arrêter l'enregistrement, cliquez sur <gui>Arrêter l'enregistrement</"
+"gui> ou appuyez sur <key>Échap</key>."
 
-#: C/account-irc.page:147(p)
-msgid ""
-"When a server is selected, click the field under <gui>Server</gui> or "
-"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
-"to focus the field, and press the space bar to begin editing."
+#: C/video-record.page:43(page/p)
+msgid "Videos are saved in the Ogg Theora (<file>.ogv</file>) format."
 msgstr ""
-"Lorsqu'un serveur est sélectionné, cliquez sur le champ en dessous de "
-"<gui>Serveur</gui> ou <gui>Port</gui> pour le modifier. Vous pouvez "
-"également utiliser les touches fléchées gauche et droite pour donner le "
-"focus au champ et appuyer sur la barre d'espace pour commencer à saisir."
+"Les vidéos sont enregistrées dans le format Ogg Theora (<file>.ogv</file>)."
 
-#: C/account-irc.page:151(p)
+#: C/video-record.page:45(page/p)
 msgid ""
-"Select the check box in the <gui>SSL</gui> column to encrypt all "
-"communication with a server. Note that this does not prevent other users on "
-"the network from seeing what you write on public chat rooms."
+"After you have stopped recording, the video will automatically appear in the "
+"photo stream at the bottom of the <app>Cheese</app> window. From there, you "
+"can <link xref=\"view-photo\">play back the video</link>, upload it to a "
+"social network, post it on your blog or YouTube channel, or share it with "
+"friends by <link href=\"help:gnome-help/net-default-email\">email</link>."
 msgstr ""
-"Cochez la case dans la colonne <gui>SSL</gui> pour chiffrer toutes les "
-"communications avec un serveur. Remarquez bien que cela n'empêche pas les "
-"autres utilisateurs sur le réseau de voir ce que vous écrivez dans les "
-"salons de discussion publics."
+"Après avoir arrêté l'enregistrement, la vidéo apparaît automatiquement dans "
+"le flux d'images en bas de la fenêtre de <app>Cheese</app>. À partir de "
+"celui-ci, vous pouvez <link xref=\"view-photo\">lire la vidéo</link>, "
+"l'envoyer vers un réseau social, la poster sur votre blog ou sur une chaîne "
+"YouTube ou la partager avec des amis par <link href=\"help:gnome-help/net-default-email\">courriel</link>."
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/index.page:0(None)
-msgid "translator-credits"
+#: C/video-record.page:51(page/p)
+msgid ""
+"If you have problems sharing a video with people using other operating "
+"systems (like Windows or Mac OS), you may need to <link href=\"help:gnome-"
+"help/video-sending\">convert it to a different format</link>."
 msgstr ""
-"Claude Paroz <claude@2xlibre.net>, 2006-2007,2010\n"
-"Jonathan Ernst <jonathan@ernstfamily.ch>, 2007\n"
-"Robert-André Mauchin <zebob.m@pengzone.org>, 2007\n"
-"Bruno Brouard <annoa.b@gmail.com>, 2007,2011\n"
-"Frédéric Péters <fpeters@0d.be>, 2008\n"
-"Rémi Peixoto <remi.peixoto@gmail.com>, 2009"
+"Si vous n'arrivez pas à partager une vidéo avec des personnes utilisant "
+"d'autres systèmes d'exploitation (comme Windows ou Mac OS), vous pouvez "
+"avoir besoin de <link href=\"help:gnome-"
+"help/video-sending\">les convertir "
+"dans un autre format</link>."
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index f511d46a4..c32448fa5 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -15,6 +15,7 @@ AM_CPPFLAGS =                                           \
 	$(GEOCODE_CFLAGS)				\
 	$(MEEGO_CFLAGS)					\
 	$(CHEESE_CFLAGS)				\
+	$(EDS_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
@@ -46,7 +47,6 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-contact-dialogs.c		\
 	empathy-contact-chooser.c		\
 	empathy-contactinfo-utils.c		\
-	empathy-linking-dialog.c		\
 	empathy-live-search.c			\
 	empathy-contact-search-dialog.c		\
 	empathy-contact-widget.c		\
@@ -55,8 +55,6 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-groups-widget.c			\
 	empathy-individual-dialogs.c		\
 	empathy-individual-edit-dialog.c	\
-	empathy-individual-information-dialog.c	\
-	empathy-individual-linker.c		\
 	empathy-individual-menu.c		\
 	empathy-individual-store.c		\
 	empathy-individual-store-channel.c		\
@@ -67,14 +65,13 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-irc-network-chooser.c \
 	empathy-irc-network-chooser-dialog.c \
 	empathy-irc-network-dialog.c		\
+	empathy-local-xmpp-assistant-widget.c \
 	empathy-log-window.c			\
 	empathy-new-account-dialog.c		\
 	empathy-new-message-dialog.c		\
 	empathy-new-call-dialog.c		\
 	empathy-notify-manager.c		\
 	empathy-password-dialog.c 		\
-	empathy-persona-store.c			\
-	empathy-persona-view.c			\
 	empathy-presence-chooser.c		\
 	empathy-protocol-chooser.c		\
 	empathy-search-bar.c			\
@@ -114,7 +111,6 @@ libempathy_gtk_headers =			\
 	empathy-contact-blocking-dialog.h	\
 	empathy-contact-dialogs.h		\
 	empathy-contact-chooser.h		\
-	empathy-linking-dialog.h		\
 	empathy-live-search.h			\
 	empathy-contact-search-dialog.h		\
 	empathy-contact-widget.h		\
@@ -125,8 +121,6 @@ libempathy_gtk_headers =			\
 	empathy-images.h			\
 	empathy-individual-dialogs.h		\
 	empathy-individual-edit-dialog.h	\
-	empathy-individual-information-dialog.h	\
-	empathy-individual-linker.h		\
 	empathy-individual-menu.h		\
 	empathy-individual-store.h		\
 	empathy-individual-store-channel.h		\
@@ -137,14 +131,13 @@ libempathy_gtk_headers =			\
 	empathy-irc-network-chooser.h \
 	empathy-irc-network-chooser-dialog.h \
 	empathy-irc-network-dialog.h		\
+	empathy-local-xmpp-assistant-widget.h \
 	empathy-log-window.h			\
 	empathy-new-account-dialog.h		\
 	empathy-new-message-dialog.h		\
 	empathy-new-call-dialog.h		\
 	empathy-notify-manager.h		\
 	empathy-password-dialog.h		\
-	empathy-persona-store.h			\
-	empathy-persona-view.h			\
 	empathy-presence-chooser.h		\
 	empathy-protocol-chooser.h		\
 	empathy-search-bar.h			\
@@ -187,6 +180,7 @@ libempathy_gtk_la_LIBADD =			\
 	$(GCR_LIBS)				\
 	$(MEEGO_LIBS)				\
 	$(CHEESE_LIBS)				\
+	$(EDS_LIBS)					\
 	$(top_builddir)/libempathy/libempathy.la
 
 check_c_sources = \
diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui
index f4ee3b559..49ac47e31 100644
--- a/libempathy-gtk/empathy-account-widget-jabber.ui
+++ b/libempathy-gtk/empathy-account-widget-jabber.ui
@@ -2,7 +2,7 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="lower">-128</property>
+    <property name="lower">0</property>
     <property name="upper">127</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
diff --git a/libempathy-gtk/empathy-account-widget-local-xmpp.ui b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
index e5fc09670..7e7cfe8e6 100644
--- a/libempathy-gtk/empathy-account-widget-local-xmpp.ui
+++ b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
@@ -15,6 +15,7 @@
           <object class="GtkEntry" id="entry_nickname">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -25,6 +26,7 @@
           <object class="GtkEntry" id="entry_last_name">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -35,6 +37,7 @@
           <object class="GtkEntry" id="entry_first_name">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -98,6 +101,7 @@
               <object class="GtkEntry" id="entry_published">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -119,6 +123,7 @@
               <object class="GtkEntry" id="entry_jid">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -129,6 +134,7 @@
               <object class="GtkEntry" id="entry_email">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index fc95f66aa..375d6246d 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -199,7 +199,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
 #define ACCOUNT_REGEX_ICQ      "^"ICQ_USER_NAME"$"
 #define ACCOUNT_REGEX_IRC      "^"IRC_NICK_NAME"$"
 #define USERNAME_REGEX_IRC     "^"IRC_USER_NAME"$"
-#define ACCOUNT_REGEX_JABBER   "^"JABBER_USER_NAME"@"HOST"$"
+#define ACCOUNT_REGEX_JABBER   "^"JABBER_USER_NAME"@[^@/]+"
 #define ACCOUNT_REGEX_MSN      "^"MSN_USER_NAME"@"HOST"$"
 #define ACCOUNT_REGEX_YAHOO    "^"YAHOO_USER_NAME"$"
 
@@ -694,6 +694,8 @@ account_widget_generic_format_param_name (const gchar *param_name)
   gchar *p;
   static GHashTable *translated_params = NULL;
 
+  g_return_val_if_fail (param_name != NULL, NULL);
+
   if (G_UNLIKELY (translated_params == NULL))
     translated_params = build_translated_params ();
 
diff --git a/libempathy-gtk/empathy-base-password-dialog.c b/libempathy-gtk/empathy-base-password-dialog.c
index be708e81c..5ca6cb676 100644
--- a/libempathy-gtk/empathy-base-password-dialog.c
+++ b/libempathy-gtk/empathy-base-password-dialog.c
@@ -272,6 +272,8 @@ empathy_base_password_dialog_constructed (GObject *object)
   gtk_widget_grab_focus (self->entry);
 
   gtk_window_set_position (GTK_WINDOW (self), GTK_WIN_POS_CENTER_ALWAYS);
+
+  gtk_window_set_keep_above (GTK_WINDOW (self), TRUE);
 }
 
 static void
diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c
index c251f1f42..60d642ccb 100644
--- a/libempathy-gtk/empathy-chat-text-view.c
+++ b/libempathy-gtk/empathy-chat-text-view.c
@@ -717,7 +717,8 @@ chat_text_view_scroll_down (EmpathyChatView *view)
 
 static void
 chat_text_view_append_message (EmpathyChatView *view,
-			       EmpathyMessage  *msg)
+			       EmpathyMessage  *msg,
+			       gboolean         should_highlight)
 {
 	EmpathyChatTextView     *text_view = EMPATHY_CHAT_TEXT_VIEW (view);
 	EmpathyChatTextViewPriv *priv = GET_PRIV (text_view);
@@ -739,7 +740,8 @@ chat_text_view_append_message (EmpathyChatView *view,
 	chat_text_maybe_append_date_and_time (text_view, timestamp);
 	if (EMPATHY_CHAT_TEXT_VIEW_GET_CLASS (view)->append_message) {
 		EMPATHY_CHAT_TEXT_VIEW_GET_CLASS (view)->append_message (text_view,
-									 msg);
+									 msg,
+									 should_highlight);
 	}
 
 	if (bottom) {
diff --git a/libempathy-gtk/empathy-chat-text-view.h b/libempathy-gtk/empathy-chat-text-view.h
index 12edbcc64..ce83fd2fa 100644
--- a/libempathy-gtk/empathy-chat-text-view.h
+++ b/libempathy-gtk/empathy-chat-text-view.h
@@ -56,7 +56,8 @@ struct _EmpathyChatTextViewClass {
 
 	/* <vtable> */
 	void (*append_message) (EmpathyChatTextView *view,
-				EmpathyMessage      *message);
+				EmpathyMessage      *message,
+				gboolean             should_highlight);
 };
 
 #define EMPATHY_CHAT_TEXT_VIEW_TAG_CUT "cut"
diff --git a/libempathy-gtk/empathy-chat-view.c b/libempathy-gtk/empathy-chat-view.c
index 088b12084..f5d6ddf09 100644
--- a/libempathy-gtk/empathy-chat-view.c
+++ b/libempathy-gtk/empathy-chat-view.c
@@ -61,13 +61,15 @@ chat_view_base_init (gpointer klass)
 
 void
 empathy_chat_view_append_message (EmpathyChatView *view,
-				  EmpathyMessage  *msg)
+				  EmpathyMessage  *msg,
+				  gboolean         should_highlight)
 {
 	g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
 
 	if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_message) {
 		EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_message (view,
-									 msg);
+									 msg,
+									 should_highlight);
 	}
 }
 
diff --git a/libempathy-gtk/empathy-chat-view.h b/libempathy-gtk/empathy-chat-view.h
index bc9e91761..2c47e0429 100644
--- a/libempathy-gtk/empathy-chat-view.h
+++ b/libempathy-gtk/empathy-chat-view.h
@@ -43,7 +43,8 @@ struct _EmpathyChatViewIface {
 
 	/* VTabled */
 	void             (*append_message)       (EmpathyChatView *view,
-						  EmpathyMessage  *msg);
+						  EmpathyMessage  *msg,
+						  gboolean         should_highlight);
 	void             (*append_event)         (EmpathyChatView *view,
 						  const gchar     *str);
 	void             (*append_event_markup)  (EmpathyChatView *view,
@@ -81,7 +82,8 @@ struct _EmpathyChatViewIface {
 
 GType            empathy_chat_view_get_type             (void) G_GNUC_CONST;
 void             empathy_chat_view_append_message       (EmpathyChatView *view,
-							 EmpathyMessage  *msg);
+							 EmpathyMessage  *msg,
+							 gboolean         should_highlight);
 void             empathy_chat_view_append_event         (EmpathyChatView *view,
 							 const gchar     *str);
 void             empathy_chat_view_append_event_markup  (EmpathyChatView *view,
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 1496f582d..d273a3792 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -73,6 +73,7 @@ struct _EmpathyChatPriv {
 	gchar             *id;
 	gchar             *name;
 	gchar             *subject;
+	EmpathyContact    *self_contact;
 	EmpathyContact    *remote_contact;
 	gboolean           show_contacts;
 
@@ -155,6 +156,14 @@ struct _EmpathyChatPriv {
 	 * the keyboard or the mouse. We can't ask GTK for the most recent
 	 * event, because it will be a notify event. Instead we track it here */
 	GdkEventType       most_recent_event_type;
+
+	/* A regex matching our own current nickname in the room, or %NULL if
+	 * !empathy_chat_is_room (). */
+	GRegex            *highlight_regex;
+
+	/* TRUE if empathy_chat_is_room () and there are unread highlighted messages.
+	 * Cleared by empathy_chat_messages_read (). */
+	gboolean           highlighted;
 };
 
 typedef struct {
@@ -368,11 +377,18 @@ static gboolean
 chat_composing_stop_timeout_cb (EmpathyChat *chat)
 {
 	EmpathyChatPriv *priv;
+	gboolean send_chat_states;
 
 	priv = GET_PRIV (chat);
 
 	priv->composing_stop_timeout_id = 0;
-	set_chat_state (chat, TP_CHANNEL_CHAT_STATE_PAUSED);
+	send_chat_states = g_settings_get_boolean (priv->gsettings_chat,
+	                                 EMPATHY_PREFS_CHAT_SEND_CHAT_STATES);
+	if (!send_chat_states) {
+		set_chat_state (chat, TP_CHANNEL_CHAT_STATE_ACTIVE);
+	} else {
+		set_chat_state (chat, TP_CHANNEL_CHAT_STATE_PAUSED);
+	}
 
 	return FALSE;
 }
@@ -381,9 +397,16 @@ static void
 chat_composing_start (EmpathyChat *chat)
 {
 	EmpathyChatPriv *priv;
+	gboolean send_chat_states;
 
 	priv = GET_PRIV (chat);
 
+	send_chat_states = g_settings_get_boolean (priv->gsettings_chat,
+	                                  EMPATHY_PREFS_CHAT_SEND_CHAT_STATES);
+	if (!send_chat_states) {
+		return;
+	}
+
 	if (priv->composing_stop_timeout_id) {
 		/* Just restart the timeout */
 		chat_composing_remove_timeout (chat);
@@ -896,14 +919,12 @@ chat_command_me (EmpathyChat *chat,
 	if (!tp_text_channel_supports_message_type (channel,
 			TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION)) {
 		/* Action message are not supported, 'simulate' the action */
-		EmpathyContact *self_contact;
 		gchar *tmp;
 
-		self_contact = empathy_tp_chat_get_self_contact (priv->tp_chat);
 		/* The TpChat can't be ready if it doesn't have the self contact */
-		g_assert (self_contact != NULL);
+		g_assert (priv->self_contact != NULL);
 
-		tmp = g_strdup_printf ("%s %s", empathy_contact_get_alias (self_contact),
+		tmp = g_strdup_printf ("%s %s", empathy_contact_get_alias (priv->self_contact),
 			strv[1]);
 		message = tp_client_message_new_text (TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL,
 			tmp);
@@ -1383,6 +1404,86 @@ chat_state_changed_cb (EmpathyTpChat      *tp_chat,
 	}
 }
 
+static GRegex *
+get_highlight_regex_for (const gchar *name)
+{
+	GRegex *regex;
+	gchar *name_esc, *pattern;
+	GError *error = NULL;
+
+	name_esc = g_regex_escape_string (name, -1);
+	pattern = g_strdup_printf ("\\b%s\\b", name_esc);
+	regex = g_regex_new (pattern, G_REGEX_CASELESS | G_REGEX_OPTIMIZE, 0,
+		&error);
+
+	if (regex == NULL) {
+		DEBUG ("couldn't compile regex /%s/: %s", pattern,
+			error->message);
+
+		g_error_free (error);
+	}
+
+	g_free (pattern);
+	g_free (name_esc);
+
+	return regex;
+}
+
+/* Called when priv->self_contact changes, or priv->self_contact:alias changes.
+ * Only connected if empathy_chat_is_room() is TRUE, for obvious-ish reasons.
+ */
+static void
+chat_self_contact_alias_changed_cb (EmpathyChat *chat)
+{
+	EmpathyChatPriv *priv = GET_PRIV (chat);
+
+	tp_clear_pointer (&priv->highlight_regex, g_regex_unref);
+
+	if (priv->self_contact != NULL) {
+		const gchar *alias = empathy_contact_get_alias (priv->self_contact);
+
+		g_return_if_fail (alias != NULL);
+		priv->highlight_regex = get_highlight_regex_for (alias);
+	}
+}
+
+static gboolean
+chat_should_highlight (EmpathyChat *chat,
+	EmpathyMessage *message)
+{
+	EmpathyChatPriv *priv = GET_PRIV (chat);
+	const gchar   *msg;
+	TpChannelTextMessageFlags flags;
+
+	g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE);
+
+	if (!empathy_chat_is_room (chat)) {
+		return FALSE;
+	}
+
+	if (!empathy_message_is_incoming (message)) {
+		return FALSE;
+	}
+
+	msg = empathy_message_get_body (message);
+	if (!msg) {
+		return FALSE;
+	}
+
+	flags = empathy_message_get_flags (message);
+	if (flags & TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK) {
+		/* FIXME: Ideally we shouldn't highlight scrollback messages only if they
+		 * have already been received by the user before (and so are in the logs) */
+		return FALSE;
+	}
+
+	if (priv->highlight_regex == NULL) {
+		return FALSE;
+	}
+
+	return g_regex_match (priv->highlight_regex, msg, 0, NULL);
+}
+
 static void
 chat_message_received (EmpathyChat *chat,
 	EmpathyMessage *message,
@@ -1400,19 +1501,26 @@ chat_message_received (EmpathyChat *chat,
 
 		empathy_chat_view_edit_message (chat->view, message);
 	} else {
+		gboolean should_highlight = chat_should_highlight (chat, message);
+
+		if (should_highlight) {
+			priv->highlighted = TRUE;
+		}
+
 		DEBUG ("Appending new message '%s' from %s (%d)",
 			empathy_message_get_token (message),
 			empathy_contact_get_alias (sender),
 			empathy_contact_get_handle (sender));
 
-		empathy_chat_view_append_message (chat->view, message);
+		empathy_chat_view_append_message (chat->view, message, should_highlight);
 
 		if (empathy_message_is_incoming (message)) {
 			priv->unread_messages++;
 			g_object_notify (G_OBJECT (chat), "nb-unread-messages");
 		}
 
-		g_signal_emit (chat, signals[NEW_MESSAGE], 0, message, pending);
+		g_signal_emit (chat, signals[NEW_MESSAGE], 0, message, pending,
+			       should_highlight);
 	}
 
 	/* We received a message so the contact is no longer
@@ -1604,15 +1712,26 @@ chat_subject_changed_cb (EmpathyChat *chat)
 			gtk_widget_show (priv->hbox_topic);
 		}
 		if (priv->block_events_timeout_id == 0) {
-			gchar *str;
+			gchar *str = NULL;
 
 			if (!EMP_STR_EMPTY (priv->subject)) {
-				str = g_strdup_printf (_("Topic set to: %s"), priv->subject);
-			} else {
+				const gchar *actor = empathy_tp_chat_get_subject_actor (priv->tp_chat);
+
+				if (tp_str_empty (actor)) {
+					str = g_strdup_printf (_("Topic set to: %s"), priv->subject);
+				} else {
+					str = g_strdup_printf (_("Topic set by %s to: %s"),
+							       actor, priv->subject);
+				}
+			} else if (empathy_tp_chat_supports_subject (priv->tp_chat)) {
+				/* No need to display this 'event' is no topic can be defined anyway */
 				str = g_strdup (_("No topic defined"));
 			}
-			empathy_chat_view_append_event (EMPATHY_CHAT (chat)->view, str);
-			g_free (str);
+
+			if (str != NULL) {
+				empathy_chat_view_append_event (EMPATHY_CHAT (chat)->view, str);
+				g_free (str);
+			}
 		}
 }
 
@@ -2491,13 +2610,15 @@ got_filtered_messages_cb (GObject *manager,
 				"sender", empathy_message_get_sender (message),
 				NULL);
 
-			empathy_chat_view_append_message (chat->view, syn_msg);
+			empathy_chat_view_append_message (chat->view, syn_msg,
+							  chat_should_highlight (chat, syn_msg));
 			empathy_chat_view_edit_message (chat->view, message);
 
 			g_object_unref (syn_msg);
 		} else {
 			/* append the latest message */
-			empathy_chat_view_append_message (chat->view, message);
+			empathy_chat_view_append_message (chat->view, message,
+							  chat_should_highlight (chat, message));
 		}
 
 		g_object_unref (message);
@@ -2796,6 +2917,32 @@ empathy_chat_set_show_contacts (EmpathyChat *chat,
 }
 
 static void
+chat_self_contact_changed_cb (EmpathyChat *chat)
+{
+	EmpathyChatPriv *priv = GET_PRIV (chat);
+
+	if (priv->self_contact != NULL) {
+		g_signal_handlers_disconnect_by_func (priv->self_contact,
+						      chat_self_contact_alias_changed_cb,
+						      chat);
+	}
+	g_clear_object (&priv->self_contact);
+
+	priv->self_contact = empathy_tp_chat_get_self_contact (priv->tp_chat);
+	if (priv->self_contact != NULL) {
+		g_object_ref (priv->self_contact);
+
+		if (empathy_chat_is_room (chat)) {
+			g_signal_connect_swapped (priv->self_contact, "notify::alias",
+					  G_CALLBACK (chat_self_contact_alias_changed_cb),
+					  chat);
+		}
+	}
+
+	chat_self_contact_alias_changed_cb (chat);
+}
+
+static void
 chat_remote_contact_changed_cb (EmpathyChat *chat)
 {
 	EmpathyChatPriv *priv = GET_PRIV (chat);
@@ -3150,6 +3297,8 @@ chat_finalize (GObject *object)
 		g_signal_handlers_disconnect_by_func (priv->tp_chat,
 			chat_members_changed_cb, chat);
 		g_signal_handlers_disconnect_by_func (priv->tp_chat,
+			chat_self_contact_changed_cb, chat);
+		g_signal_handlers_disconnect_by_func (priv->tp_chat,
 			chat_remote_contact_changed_cb, chat);
 		g_signal_handlers_disconnect_by_func (priv->tp_chat,
 			chat_title_changed_cb, chat);
@@ -3161,6 +3310,12 @@ chat_finalize (GObject *object)
 	if (priv->account) {
 		g_object_unref (priv->account);
 	}
+	if (priv->self_contact) {
+		g_signal_handlers_disconnect_by_func (priv->self_contact,
+						      chat_self_contact_alias_changed_cb,
+						      chat);
+		g_object_unref (priv->self_contact);
+	}
 	if (priv->remote_contact) {
 		g_object_unref (priv->remote_contact);
 	}
@@ -3174,6 +3329,8 @@ chat_finalize (GObject *object)
 	g_free (priv->subject);
 	g_completion_free (priv->completion);
 
+	tp_clear_pointer (&priv->highlight_regex, g_regex_unref);
+
 	G_OBJECT_CLASS (empathy_chat_parent_class)->finalize (object);
 }
 
@@ -3296,6 +3453,14 @@ empathy_chat_class_init (EmpathyChatClass *klass)
 			      G_TYPE_NONE,
 			      1, G_TYPE_BOOLEAN);
 
+	/**
+	 * EmpathyChat::new-message:
+	 * @self: the #EmpathyChat
+	 * @message: the new message
+	 * @pending: whether the message was in the pending queue when @self
+	 *  was created
+	 * @should_highlight: %TRUE if the message mentions the local user
+	 */
 	signals[NEW_MESSAGE] =
 		g_signal_new ("new-message",
 			      G_OBJECT_CLASS_TYPE (object_class),
@@ -3304,7 +3469,7 @@ empathy_chat_class_init (EmpathyChatClass *klass)
 			      NULL, NULL,
 			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
-			      2, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN);
+			      3, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
 
 	signals[PART_COMMAND_ENTERED] =
 			g_signal_new ("part-command-entered",
@@ -3870,6 +4035,9 @@ empathy_chat_set_tp_chat (EmpathyChat   *chat,
 	g_signal_connect (tp_chat, "member-renamed",
 			  G_CALLBACK (chat_member_renamed_cb),
 			  chat);
+	g_signal_connect_swapped (tp_chat, "notify::self-contact",
+				  G_CALLBACK (chat_self_contact_changed_cb),
+				  chat);
 	g_signal_connect_swapped (tp_chat, "notify::remote-contact",
 				  G_CALLBACK (chat_remote_contact_changed_cb),
 				  chat);
@@ -3891,6 +4059,7 @@ empathy_chat_set_tp_chat (EmpathyChat   *chat,
 
 	/* Get initial value of properties */
 	chat_sms_channel_changed_cb (chat);
+	chat_self_contact_changed_cb (chat);
 	chat_remote_contact_changed_cb (chat);
 	chat_title_changed_cb (chat);
 	chat_subject_changed_cb (chat);
@@ -4000,7 +4169,8 @@ empathy_chat_get_contact_menu (EmpathyChat *chat)
 	if (contact == NULL)
 		return NULL;
 
-	individual = empathy_create_individual_from_tp_contact (contact);
+	individual = empathy_ensure_individual_from_tp_contact (contact);
+
 	if (individual == NULL)
 		return NULL;
 
@@ -4162,6 +4332,16 @@ empathy_chat_is_room (EmpathyChat *chat)
 	return (priv->handle_type == TP_HANDLE_TYPE_ROOM);
 }
 
+gboolean
+empathy_chat_is_highlighted (EmpathyChat *chat)
+{
+	EmpathyChatPriv *priv = GET_PRIV (chat);
+
+	g_return_val_if_fail (EMPATHY_IS_CHAT (chat), FALSE);
+
+	return priv->highlighted;
+}
+
 guint
 empathy_chat_get_nb_unread_messages (EmpathyChat *self)
 {
@@ -4190,6 +4370,8 @@ empathy_chat_messages_read (EmpathyChat *self)
 			TP_TEXT_CHANNEL (priv->tp_chat), NULL, NULL);
 	}
 
+	priv->highlighted = FALSE;
+
 	if (priv->unread_messages_when_offline > 0) {
 		/* We can't ack those as the connection has gone away so just consider
 		* them as read. */
diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index 0031410d6..00da3d641 100644
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -89,7 +89,7 @@ gboolean           empathy_chat_is_room              (EmpathyChat   *chat);
 void               empathy_chat_set_show_contacts    (EmpathyChat *chat,
                                                       gboolean     show);
 guint              empathy_chat_get_nb_unread_messages (EmpathyChat   *chat);
-
+gboolean           empathy_chat_is_highlighted (EmpathyChat *chat);
 void               empathy_chat_messages_read        (EmpathyChat *self);
 
 gboolean           empathy_chat_is_composing (EmpathyChat *chat);
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index 4699fba77..00d737bda 100644
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -39,7 +39,6 @@
 
 static GList *subscription_dialogs = NULL;
 static GList *information_dialogs = NULL;
-static GtkWidget *personal_dialog = NULL;
 static GtkWidget *new_contact_dialog = NULL;
 
 static gint
@@ -261,58 +260,6 @@ empathy_contact_information_dialog_show (EmpathyContact *contact,
 	gtk_widget_show (dialog);
 }
 
-void
-empathy_contact_personal_dialog_show (GtkWindow *parent)
-{
-	GtkWidget *button;
-	GtkWidget *contact_widget;
-
-	if (personal_dialog) {
-		gtk_window_present (GTK_WINDOW (personal_dialog));
-		return;
-	}
-
-	/* Create dialog */
-	personal_dialog = gtk_dialog_new ();
-	gtk_window_set_resizable (GTK_WINDOW (personal_dialog), FALSE);
-	gtk_window_set_title (GTK_WINDOW (personal_dialog), _("Personal Information"));
-
-	/* Close button */
-	button = gtk_button_new_with_label (GTK_STOCK_CLOSE);
-	gtk_button_set_use_stock (GTK_BUTTON (button), TRUE);
-	gtk_dialog_add_action_widget (GTK_DIALOG (personal_dialog),
-				      button,
-				      GTK_RESPONSE_CLOSE);
-	gtk_widget_set_can_default (button, TRUE);
-	gtk_window_set_default (GTK_WINDOW (personal_dialog), button);
-	gtk_widget_show (button);
-
-	/* Contact info widget */
-	contact_widget = empathy_contact_widget_new (NULL,
-		EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT |
-		EMPATHY_CONTACT_WIDGET_EDIT_ALIAS |
-		EMPATHY_CONTACT_WIDGET_EDIT_AVATAR |
-		EMPATHY_CONTACT_WIDGET_EDIT_DETAILS);
-	gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8);
-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (personal_dialog))),
-			    contact_widget,
-			    TRUE, TRUE, 0);
-	empathy_contact_widget_set_account_filter (contact_widget,
-		empathy_account_chooser_filter_is_connected, NULL);
-	gtk_widget_show (contact_widget);
-
-	g_signal_connect (personal_dialog, "response",
-			  G_CALLBACK (gtk_widget_destroy), NULL);
-	g_object_add_weak_pointer (G_OBJECT (personal_dialog),
-				   (gpointer) &personal_dialog);
-
-	if (parent) {
-		gtk_window_set_transient_for (GTK_WINDOW (personal_dialog), parent);
-	}
-
-	gtk_widget_show (personal_dialog);
-}
-
 /*
  *  New contact dialog
  */
diff --git a/libempathy-gtk/empathy-contact-dialogs.h b/libempathy-gtk/empathy-contact-dialogs.h
index fff0fff88..8eb787702 100644
--- a/libempathy-gtk/empathy-contact-dialogs.h
+++ b/libempathy-gtk/empathy-contact-dialogs.h
@@ -33,7 +33,6 @@ void empathy_subscription_dialog_show        (EmpathyContact *contact,
 				              GtkWindow      *parent);
 void empathy_contact_information_dialog_show (EmpathyContact *contact,
 					      GtkWindow      *parent);
-void empathy_contact_personal_dialog_show    (GtkWindow      *parent);
 void empathy_new_contact_dialog_show         (GtkWindow     *parent);
 void empathy_new_contact_dialog_show_with_contact (GtkWindow     *parent,
                                                    EmpathyContact *contact);
diff --git a/libempathy-gtk/empathy-contact-dialogs.ui b/libempathy-gtk/empathy-contact-dialogs.ui
index ecafddb69..7f29d040d 100644
--- a/libempathy-gtk/empathy-contact-dialogs.ui
+++ b/libempathy-gtk/empathy-contact-dialogs.ui
@@ -73,7 +73,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button20">
-                <property name="label">gtk-no</property>
+                <property name="label">_Reject</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -88,7 +88,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button21">
-                <property name="label">gtk-yes</property>
+                <property name="label">_Accept</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 531f8e410..b352ee124 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -88,7 +88,6 @@ typedef struct
   GtkWidget *vbox_contact_widget;
 
   /* Contact */
-  GtkWidget *hbox_contact;
   GtkWidget *widget_avatar;
   GtkWidget *widget_account;
   GtkWidget *image_account;
@@ -102,6 +101,7 @@ typedef struct
   GtkWidget *grid_contact;
   GtkWidget *vbox_avatar;
   GtkWidget *favourite_checkbox;
+  GtkWidget *label_details;
 
   /* Location */
   GtkWidget *vbox_location;
@@ -1440,6 +1440,13 @@ contact_widget_contact_update (EmpathyContactWidget *information)
 
       gtk_widget_set_visible (information->hbox_presence,
           !(information->flags & EMPATHY_CONTACT_WIDGET_NO_STATUS));
+
+      if (empathy_contact_is_user (information->contact))
+        gtk_label_set_text (GTK_LABEL (information->label_details),
+            _("Personal Details"));
+      else
+        gtk_label_set_text (GTK_LABEL (information->label_details),
+            _("Contact Details"));
     }
   else
     {
@@ -1738,7 +1745,6 @@ empathy_contact_widget_new (EmpathyContact *contact,
       "libempathy-gtk");
   gui = empathy_builder_get_file (filename,
        "vbox_contact_widget", &information->vbox_contact_widget,
-       "hbox_contact", &information->hbox_contact,
        "hbox_presence", &information->hbox_presence,
        "label_alias", &information->label_alias,
        "image_state", &information->image_state,
@@ -1757,6 +1763,7 @@ empathy_contact_widget_new (EmpathyContact *contact,
        "vbox_client", &information->vbox_client,
        "grid_client", &information->grid_client,
        "hbox_client_requested", &information->hbox_client_requested,
+       "label_details", &information->label_details,
        NULL);
   g_free (filename);
 
diff --git a/libempathy-gtk/empathy-contact-widget.ui b/libempathy-gtk/empathy-contact-widget.ui
index 96e9275e1..a8d9fbe7a 100644
--- a/libempathy-gtk/empathy-contact-widget.ui
+++ b/libempathy-gtk/empathy-contact-widget.ui
@@ -5,104 +5,75 @@
   <object class="GtkVBox" id="vbox_contact_widget">
     <property name="spacing">6</property>
     <child>
-      <object class="GtkHBox" id="hbox_contact">
+    <object class="GtkGrid" id="grid_contact">
         <property name="visible">True</property>
-        <property name="spacing">6</property>
+        <property name="column_spacing">6</property>
+        <property name="row_spacing">6</property>
+        <child>
+          <object class="GtkLabel" id="label680">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Account:</property>
+          </object>
+          <packing>
+          </packing>
+        </child>
         <child>
-          <object class="GtkVBox" id="vbox225">
+          <object class="GtkLabel" id="label655">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes" comments="Identifier to connect to Instant Messaging network">Identifier:</property>
+          </object>
+          <packing>
+            <property name="top_attach">1</property>
+            <property name="left_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label_alias">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Alias:</property>
+          </object>
+          <packing>
+            <property name="top_attach">2</property>
+            <property name="left_attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox_presence">
             <property name="visible">True</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkGrid" id="grid_contact">
-                <property name="visible">True</property>
-                <property name="column_spacing">6</property>
-                <property name="row_spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="label680">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Account:</property>
-                  </object>
-                  <packing>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label655">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes" comments="Identifier to connect to Instant Messaging network">Identifier:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="left_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_alias">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Alias:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="left_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+              <object class="GtkImage" id="image_state">
+                <property name="stock">gtk-missing-image</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkHBox" id="hbox_presence">
-                <property name="visible">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkImage" id="image_state">
-                    <property name="stock">gtk-missing-image</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
           </object>
           <packing>
-            <property name="position">0</property>
+            <property name="top_attach">3</property>
+            <property name="left_attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkVBox" id="vbox_avatar">
-            <property name="visible">True</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
+                    <property name="visible">True</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="top-attach">0</property>
+                    <property name="left-attach">2</property>
+                    <property name="height">3</property>
+                  </packing>
+                </child>
+              </object>
       <packing>
         <property name="position">0</property>
       </packing>
@@ -173,7 +144,7 @@
       <object class="GtkVBox" id="vbox_details">
         <property name="spacing">6</property>
         <child>
-          <object class="GtkLabel" id="label649">
+          <object class="GtkLabel" id="label_details">
             <property name="visible">True</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">Contact Details</property>
diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
index 695d1ee3c..b995297b0 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -314,7 +314,7 @@ empathy_contact_info_create_channel_list_label (TpAccount *account,
         g_string_append (label_markup, ", ");
 
       g_string_append_printf (label_markup, "<a href='%s'>%s</a>",
-          escaped, channel_name);
+          escaped, escaped);
       g_free (escaped);
     }
 
diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
deleted file mode 100644
index 42bfb2053..000000000
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2007-2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- *          Philip Withnall <philip.withnall@collabora.co.uk>
- *          Travis Reitter <travis.reitter@collabora.co.uk>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
-
-#include <telepathy-glib/util.h>
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-individual-information-dialog.h"
-#include "empathy-individual-widget.h"
-#include "empathy-ui-utils.h"
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualInformationDialog)
-typedef struct {
-  FolksIndividual *individual;
-  GtkWidget *individual_widget; /* child widget */
-  GtkWidget *label; /* child widget */
-} EmpathyIndividualInformationDialogPriv;
-
-enum {
-  PROP_0,
-  PROP_INDIVIDUAL,
-};
-
-/* Info dialogs currently open.
- * Each dialog contains a referenced pointer to its Individual */
-static GList *information_dialogs = NULL;
-
-static void individual_information_dialog_set_individual (
-    EmpathyIndividualInformationDialog *dialog,
-    FolksIndividual *individual);
-
-G_DEFINE_TYPE (EmpathyIndividualInformationDialog,
-    empathy_individual_information_dialog, GTK_TYPE_DIALOG);
-
-static void
-individual_dialogs_response_cb (GtkDialog *dialog,
-    gint response,
-    GList **dialogs)
-{
-  *dialogs = g_list_remove (*dialogs, dialog);
-  gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-static gint
-individual_dialogs_find (GObject *object,
-    FolksIndividual *individual)
-{
-  EmpathyIndividualInformationDialogPriv *priv = GET_PRIV (object);
-
-  return individual != priv->individual;
-}
-
-void
-empathy_individual_information_dialog_show (FolksIndividual *individual,
-    GtkWindow *parent)
-{
-  GtkWidget *dialog;
-  GList *l;
-
-  g_return_if_fail (FOLKS_IS_INDIVIDUAL (individual));
-  g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent));
-
-  l = g_list_find_custom (information_dialogs, individual,
-      (GCompareFunc) individual_dialogs_find);
-
-  if (l != NULL)
-    {
-      gtk_window_present (GTK_WINDOW (l->data));
-      return;
-    }
-
-  /* Create dialog */
-  dialog = g_object_new (EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG,
-      "individual", individual,
-      NULL);
-
-  information_dialogs = g_list_prepend (information_dialogs, dialog);
-  gtk_widget_show (dialog);
-}
-
-static void
-individual_removed_cb (FolksIndividual *individual,
-    FolksIndividual *replacement_individual,
-    EmpathyIndividualInformationDialog *self)
-{
-  individual_information_dialog_set_individual (self,
-      replacement_individual);
-
-  /* Destroy the dialogue */
-  if (replacement_individual == NULL)
-    {
-      individual_dialogs_response_cb (GTK_DIALOG (self),
-          GTK_RESPONSE_DELETE_EVENT, &information_dialogs);
-    }
-}
-
-static void
-set_label_visibility (EmpathyIndividualInformationDialog *dialog)
-{
-  EmpathyIndividualInformationDialogPriv *priv = GET_PRIV (dialog);
-  guint num_personas = 0;
-
-  /* Count how many Telepathy personas we have, to see whether we can
-   * unlink */
-  if (priv->individual != NULL)
-    {
-      GeeSet *personas;
-      GeeIterator *iter;
-
-      personas = folks_individual_get_personas (priv->individual);
-      iter = gee_iterable_iterator (GEE_ITERABLE (personas));
-      while (gee_iterator_next (iter))
-        {
-          FolksPersona *persona = gee_iterator_get (iter);
-          if (empathy_folks_persona_is_interesting (persona))
-            num_personas++;
-
-          g_clear_object (&persona);
-        }
-      g_clear_object (&iter);
-    }
-
-  /* Only make the label visible if we have enough personas */
-  gtk_widget_set_visible (priv->label, (num_personas > 1) ? TRUE : FALSE);
-}
-
-static void
-individual_information_dialog_set_individual (
-    EmpathyIndividualInformationDialog *dialog,
-    FolksIndividual *individual)
-{
-  EmpathyIndividualInformationDialogPriv *priv;
-
-  g_return_if_fail (EMPATHY_INDIVIDUAL_INFORMATION_DIALOG (dialog));
-  g_return_if_fail (individual == NULL || FOLKS_IS_INDIVIDUAL (individual));
-
-  priv = GET_PRIV (dialog);
-
-  /* Remove the old Individual */
-  if (priv->individual != NULL)
-    {
-      g_signal_handlers_disconnect_by_func (priv->individual,
-          (GCallback) individual_removed_cb, dialog);
-    }
-
-  tp_clear_object (&priv->individual);
-
-  /* Add the new Individual */
-  priv->individual = individual;
-
-  if (individual != NULL)
-    {
-      g_object_ref (individual);
-      g_signal_connect (individual, "removed",
-          (GCallback) individual_removed_cb, dialog);
-
-      /* Update the UI */
-      gtk_window_set_title (GTK_WINDOW (dialog),
-          folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)));
-      empathy_individual_widget_set_individual (
-          EMPATHY_INDIVIDUAL_WIDGET (priv->individual_widget), individual);
-      set_label_visibility (dialog);
-    }
-}
-
-static void
-individual_information_dialog_get_property (GObject *object,
-    guint param_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyIndividualInformationDialogPriv *priv = GET_PRIV (object);
-
-  switch (param_id) {
-  case PROP_INDIVIDUAL:
-    g_value_set_object (value, priv->individual);
-    break;
-  default:
-    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-    break;
-  };
-}
-
-static void
-individual_information_dialog_set_property (GObject *object,
-  guint param_id,
-  const GValue *value,
-  GParamSpec   *pspec)
-{
-  EmpathyIndividualInformationDialog *dialog =
-    EMPATHY_INDIVIDUAL_INFORMATION_DIALOG (object);
-
-  switch (param_id) {
-  case PROP_INDIVIDUAL:
-    individual_information_dialog_set_individual (dialog,
-        FOLKS_INDIVIDUAL (g_value_get_object (value)));
-    break;
-  default:
-    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-    break;
-  };
-}
-
-static void
-individual_information_dialog_dispose (GObject *object)
-{
-  individual_information_dialog_set_individual (
-      EMPATHY_INDIVIDUAL_INFORMATION_DIALOG (object), NULL);
-
-  G_OBJECT_CLASS (
-      empathy_individual_information_dialog_parent_class)->dispose (object);
-}
-
-static void
-empathy_individual_information_dialog_class_init (
-    EmpathyIndividualInformationDialogClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = individual_information_dialog_dispose;
-  object_class->get_property = individual_information_dialog_get_property;
-  object_class->set_property = individual_information_dialog_set_property;
-
-  g_object_class_install_property (object_class,
-      PROP_INDIVIDUAL,
-      g_param_spec_object ("individual",
-          "Folks Individual",
-          "Folks Individual to base the dialog upon",
-          FOLKS_TYPE_INDIVIDUAL,
-          G_PARAM_CONSTRUCT |
-          G_PARAM_READWRITE |
-          G_PARAM_STATIC_STRINGS));
-
-  g_type_class_add_private (object_class,
-      sizeof (EmpathyIndividualInformationDialogPriv));
-}
-
-static void
-empathy_individual_information_dialog_init (
-    EmpathyIndividualInformationDialog *dialog)
-{
-  GtkWidget *button;
-  GtkBox *content_area;
-  gchar *label_string;
-  EmpathyIndividualInformationDialogPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (
-      dialog, EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG,
-      EmpathyIndividualInformationDialogPriv);
-
-  dialog->priv = priv;
-  priv->individual = NULL;
-
-  gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
-
-  content_area = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
-
-  /* Translators: the heading at the top of the Information dialogue */
-  label_string = g_strdup_printf ("<b>%s</b>", _("Linked Contacts"));
-  priv->label = gtk_label_new (NULL);
-  gtk_label_set_markup (GTK_LABEL (priv->label), label_string);
-  g_free (label_string);
-
-  gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5);
-  gtk_misc_set_padding (GTK_MISC (priv->label), 6, 6);
-  gtk_box_pack_start (content_area, priv->label, FALSE, TRUE, 0);
-  gtk_widget_show (priv->label);
-
-  /* Individual widget */
-  priv->individual_widget = empathy_individual_widget_new (priv->individual,
-      EMPATHY_INDIVIDUAL_WIDGET_SHOW_LOCATION |
-      EMPATHY_INDIVIDUAL_WIDGET_SHOW_DETAILS |
-      EMPATHY_INDIVIDUAL_WIDGET_SHOW_PERSONAS);
-  gtk_container_set_border_width (GTK_CONTAINER (priv->individual_widget), 6);
-  gtk_box_pack_start (content_area, priv->individual_widget, TRUE, TRUE, 0);
-  gtk_widget_show (priv->individual_widget);
-
-  /* Close button */
-  button = gtk_button_new_with_label (GTK_STOCK_CLOSE);
-  gtk_button_set_use_stock (GTK_BUTTON (button), TRUE);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button,
-      GTK_RESPONSE_CLOSE);
-  gtk_widget_set_can_default (button, TRUE);
-  gtk_window_set_default (GTK_WINDOW (dialog), button);
-  gtk_widget_show (button);
-
-  g_signal_connect (dialog, "response",
-      G_CALLBACK (individual_dialogs_response_cb), &information_dialogs);
-}
diff --git a/libempathy-gtk/empathy-individual-information-dialog.h b/libempathy-gtk/empathy-individual-information-dialog.h
deleted file mode 100644
index aad26702f..000000000
--- a/libempathy-gtk/empathy-individual-information-dialog.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Philip Withnall <philip.withnall@collabora.co.uk>
- *          Travis Reitter <travis.reitter@collabora.co.uk>
- */
-
-#ifndef __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__
-#define __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__
-
-#include <gtk/gtk.h>
-
-#include <folks/folks.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG         (empathy_individual_information_dialog_get_type ())
-#define EMPATHY_INDIVIDUAL_INFORMATION_DIALOG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG, EmpathyIndividualInformationDialog))
-#define EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG, EmpathyIndividualInformationDialogClass))
-#define EMPATHY_IS_INDIVIDUAL_INFORMATION_DIALOG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG))
-#define EMPATHY_IS_INDIVIDUAL_INFORMATION_DIALOG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG))
-#define EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_INDIVIDUAL_INFORMATION_DIALOG, EmpathyIndividualInformationDialogClass))
-
-typedef struct _EmpathyIndividualInformationDialog      EmpathyIndividualInformationDialog;
-typedef struct _EmpathyIndividualInformationDialogClass EmpathyIndividualInformationDialogClass;
-
-struct _EmpathyIndividualInformationDialog {
-  GtkDialog parent;
-
-  /*<private>*/
-  gpointer priv;
-};
-
-struct _EmpathyIndividualInformationDialogClass {
-  GtkDialogClass parent_class;
-};
-
-GType empathy_individual_information_dialog_get_type (void) G_GNUC_CONST;
-
-void empathy_individual_information_dialog_show (FolksIndividual *individual,
-    GtkWindow *parent);
-
-G_END_DECLS
-
-#endif /*  __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__ */
diff --git a/libempathy-gtk/empathy-individual-linker.c b/libempathy-gtk/empathy-individual-linker.c
deleted file mode 100644
index 7de5e4add..000000000
--- a/libempathy-gtk/empathy-individual-linker.c
+++ /dev/null
@@ -1,779 +0,0 @@
-/*
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Philip Withnall <philip.withnall@collabora.co.uk>
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/util.h>
-
-#include <folks/folks.h>
-
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-individual-linker.h"
-#include "empathy-individual-store.h"
-#include "empathy-individual-store-manager.h"
-#include "empathy-individual-view.h"
-#include "empathy-individual-widget.h"
-#include "empathy-persona-store.h"
-#include "empathy-persona-view.h"
-
-/**
- * SECTION:empathy-individual-linker
- * @title:EmpathyIndividualLinker
- * @short_description: A widget used to link together #FolksIndividual<!-- -->s
- * @include: libempathy-gtk/empathy-individual-linker.h
- *
- * #EmpathyIndividualLinker is a widget which allows selection of several
- * #FolksIndividual<!-- -->s to link together to form a single new individual.
- * The widget provides a preview of the linked individual.
- */
-
-/**
- * EmpathyIndividualLinker:
- * @parent: parent object
- *
- * Widget which extends #GtkBin to provide a list of #FolksIndividual<!-- -->s
- * to link together.
- */
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualLinker)
-
-typedef struct {
-  EmpathyIndividualStore *individual_store; /* owned */
-  EmpathyIndividualView *individual_view; /* child widget */
-  GtkWidget *preview_widget; /* child widget */
-  EmpathyPersonaStore *persona_store; /* owned */
-  GtkTreeViewColumn *toggle_column; /* child widget */
-  GtkCellRenderer *toggle_renderer; /* child widget */
-  GtkWidget *search_widget; /* child widget */
-
-  FolksIndividual *start_individual; /* owned, allow-none */
-  FolksIndividual *new_individual; /* owned, allow-none */
-
-  /* Stores the Individuals whose Personas have been added to the
-   * new_individual */
-  /* unowned Individual (borrowed from EmpathyIndividualStore) -> bool */
-  GHashTable *changed_individuals;
-} EmpathyIndividualLinkerPriv;
-
-enum {
-  PROP_START_INDIVIDUAL = 1,
-  PROP_HAS_CHANGED,
-};
-
-G_DEFINE_TYPE (EmpathyIndividualLinker, empathy_individual_linker,
-    GTK_TYPE_BOX);
-
-static void
-contact_toggle_cell_data_func (GtkTreeViewColumn *tree_column,
-    GtkCellRenderer *cell,
-    GtkTreeModel *tree_model,
-    GtkTreeIter *iter,
-    EmpathyIndividualLinker *self)
-{
-  EmpathyIndividualLinkerPriv *priv;
-  FolksIndividual *individual;
-  gboolean is_group, individual_added;
-
-  priv = GET_PRIV (self);
-
-  gtk_tree_model_get (tree_model, iter,
-      EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, &is_group,
-      EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual,
-      -1);
-
-  individual_added = GPOINTER_TO_UINT (g_hash_table_lookup (
-      priv->changed_individuals, individual));
-
-  /* We don't want to show checkboxes next to the group rows.
-   * All checkboxes should be sensitive except the checkbox for the start
-   * individual, which should be permanently active and insensitive */
-  g_object_set (cell,
-      "visible", !is_group,
-      "sensitive", individual != priv->start_individual,
-      "activatable", individual != priv->start_individual,
-      "active", individual_added || individual == priv->start_individual,
-      NULL);
-
-  tp_clear_object (&individual);
-}
-
-static void
-update_toggle_renderers (EmpathyIndividualLinker *self)
-{
-  EmpathyIndividualLinkerPriv *priv = GET_PRIV (self);
-
-  /* Re-setting the cell data func to the same function causes a refresh of the
-   * entire column, ensuring that each toggle button is correctly active or
-   * inactive. This is necessary because one Individual might appear multiple
-   * times in the list (in different groups), so toggling one instance of the
-   * Individual should toggle all of them. */
-  gtk_tree_view_column_set_cell_data_func (priv->toggle_column,
-      priv->toggle_renderer,
-      (GtkTreeCellDataFunc) contact_toggle_cell_data_func, self, NULL);
-}
-
-static void
-link_individual (EmpathyIndividualLinker *self,
-    FolksIndividual *individual)
-{
-  EmpathyIndividualLinkerPriv *priv = GET_PRIV (self);
-  GeeSet *old_personas, *new_personas;
-  GeeHashSet *final_personas;
-  gboolean personas_changed;
-
-  /* Add the individual to the link */
-  g_hash_table_insert (priv->changed_individuals, individual,
-      GUINT_TO_POINTER (TRUE));
-
-  /* Add personas which are in @individual to priv->new_individual, adding them
-   * to the set of personas. */
-  old_personas = folks_individual_get_personas (individual);
-  new_personas = folks_individual_get_personas (priv->new_individual);
-  final_personas = gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref,
-      g_object_unref, g_direct_hash, g_direct_equal);
-  gee_collection_add_all (GEE_COLLECTION (final_personas),
-      GEE_COLLECTION (old_personas));
-  personas_changed = gee_collection_add_all (GEE_COLLECTION (final_personas),
-      GEE_COLLECTION (new_personas));
-
-  /* avoid updating all values in the Individual if the set of personas doesn't
-   * actually change */
-  if (personas_changed)
-    {
-      folks_individual_set_personas (priv->new_individual,
-          GEE_SET (final_personas));
-    }
-
-  g_clear_object (&final_personas);
-
-  /* Update the toggle renderers, so that if this Individual is listed in
-   * another group in the EmpathyIndividualView, the toggle button for that
-   * group is updated. */
-  update_toggle_renderers (self);
-
-  g_object_notify (G_OBJECT (self), "has-changed");
-}
-
-static void
-unlink_individual (EmpathyIndividualLinker *self,
-    FolksIndividual *individual)
-{
-  EmpathyIndividualLinkerPriv *priv = GET_PRIV (self);
-  GeeSet *removed_personas, *old_personas;
-  GeeHashSet *final_personas;
-  gboolean personas_changed;
-
-  /* Remove the individual from the link */
-  g_hash_table_remove (priv->changed_individuals, individual);
-
-  /* Remove personas which are in @individual from priv->new_individual. */
-  old_personas = folks_individual_get_personas (priv->new_individual);
-  removed_personas = folks_individual_get_personas (individual);
-
-  final_personas = gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref,
-      g_object_unref, g_direct_hash, g_direct_equal);
-  gee_collection_add_all (GEE_COLLECTION (final_personas),
-      GEE_COLLECTION (old_personas));
-  personas_changed = gee_collection_remove_all (GEE_COLLECTION (final_personas),
-      GEE_COLLECTION (removed_personas));
-
-  if (personas_changed)
-    {
-      folks_individual_set_personas (priv->new_individual,
-          GEE_SET (final_personas));
-    }
-
-  g_clear_object (&final_personas);
-
-  /* Update the toggle renderers, so that if this Individual is listed in
-   * another group in the EmpathyIndividualView, the toggle button for that
-   * group is updated. */
-  update_toggle_renderers (self);
-
-  g_object_notify (G_OBJECT (self), "has-changed");
-}
-
-static void
-toggle_individual_row (EmpathyIndividualLinker *self,
-    GtkTreePath *path)
-{
-  EmpathyIndividualLinkerPriv *priv = GET_PRIV (self);
-  FolksIndividual *individual;
-  GtkTreeIter iter;
-  GtkTreeModel *tree_model;
-  gboolean individual_added;
-
-  tree_model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->individual_view));
-
-  gtk_tree_model_get_iter (tree_model, &iter, path);
-  gtk_tree_model_get (tree_model, &iter,
-      EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual,
-      -1);
-
-  if (individual == NULL)
-    return;
-
-  individual_added = GPOINTER_TO_UINT (g_hash_table_lookup (
-      priv->changed_individuals, individual));
-
-  /* Toggle the Individual's linked status */
-  if (individual_added)
-    unlink_individual (self, individual);
-  else
-    link_individual (self, individual);
-
-  g_object_unref (individual);
-}
-
-static void
-row_activated_cb (EmpathyIndividualView *view,
-    GtkTreePath *path,
-    GtkTreeViewColumn *column,
-    EmpathyIndividualLinker *self)
-{
-  toggle_individual_row (self, path);
-}
-
-static void
-row_toggled_cb (GtkCellRendererToggle *cell_renderer,
-    const gchar *path,
-    EmpathyIndividualLinker *self)
-{
-  GtkTreePath *tree_path = gtk_tree_path_new_from_string (path);
-  toggle_individual_row (self, tree_path);
-  gtk_tree_path_free (tree_path);
-}
-
-static gboolean
-individual_view_drag_motion_cb (GtkWidget *widget,
-    GdkDragContext *context,
-    gint x,
-    gint y,
-    guint time_)
-{
-  EmpathyIndividualView *view = EMPATHY_INDIVIDUAL_VIEW (widget);
-  GdkAtom target;
-
-  target = gtk_drag_dest_find_target (GTK_WIDGET (view), context, NULL);
-
-  if (target == gdk_atom_intern_static_string ("text/x-persona-id"))
-    {
-      GtkTreePath *path;
-
-      /* FIXME: It doesn't make sense for us to highlight a specific row or
-       * position to drop a Persona in, so just highlight the entire widget.
-       * Since I can't find a way to do this, just highlight the first possible
-       * position in the tree. */
-      gdk_drag_status (context, gdk_drag_context_get_suggested_action (context),
-          time_);
-
-      path = gtk_tree_path_new_first ();
-      gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (view), path,
-          GTK_TREE_VIEW_DROP_BEFORE);
-      gtk_tree_path_free (path);
-
-      return TRUE;
-    }
-
-  /* Unknown or unhandled drag target */
-  gdk_drag_status (context, GDK_ACTION_DEFAULT, time_);
-  gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (view), NULL, 0);
-
-  return FALSE;
-}
-
-static gboolean
-individual_view_drag_persona_received_cb (EmpathyIndividualView *view,
-    GdkDragAction action,
-    FolksPersona *persona,
-    FolksIndividual *individual,
-    EmpathyIndividualLinker *self)
-{
-  EmpathyIndividualLinkerPriv *priv = GET_PRIV (self);
-
-  /* A Persona has been dragged onto the EmpathyIndividualView (from the
-   * EmpathyPersonaView), so we try to remove the Individual which contains
-   * the Persona from the link. */
-  if (individual != priv->start_individual)
-    {
-      unlink_individual (self, individual);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
-persona_view_drag_individual_received_cb (EmpathyPersonaView *view,
-    GdkDragAction action,
-    FolksIndividual *individual,
-    EmpathyIndividualLinker *self)
-{
-  /* An Individual has been dragged onto the EmpathyPersonaView (from the
-   * EmpathyIndividualView), so we try to add the Individual to the link. */
-  link_individual (self, individual);
-
-  return TRUE;
-}
-
-static void
-set_up (EmpathyIndividualLinker *self)
-{
-  EmpathyIndividualLinkerPriv *priv;
-  EmpathyIndividualManager *individual_manager;
-  GtkWidget *top_vbox;
-  GtkPaned *paned;
-  GtkWidget *label, *scrolled_window;
-  GtkBox *vbox;
-  EmpathyPersonaView *persona_view;
-  gchar *tmp;
-  GtkWidget *alignment;
-
-  priv = GET_PRIV (self);
-
-  top_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-
-  /* Layout panes */
-
-  paned = GTK_PANED (gtk_paned_new (GTK_ORIENTATION_HORIZONTAL));
-
-  /* Left column heading */
-  alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 0, 6);
-  gtk_widget_show (alignment);
-
-  vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6));
-  label = gtk_label_new (NULL);
-  tmp = g_strdup_printf ("<b>%s</b>", _("Select contacts to link"));
-  gtk_label_set_markup (GTK_LABEL (label), tmp);
-  g_free (tmp);
-  gtk_box_pack_start (vbox, label, FALSE, TRUE, 0);
-  gtk_widget_show (label);
-
-  /* Individual selector */
-  individual_manager = empathy_individual_manager_dup_singleton ();
-  priv->individual_store = EMPATHY_INDIVIDUAL_STORE (
-      empathy_individual_store_manager_new (individual_manager));
-  g_object_unref (individual_manager);
-
-  empathy_individual_store_set_show_protocols (priv->individual_store, FALSE);
-
-  priv->individual_view = empathy_individual_view_new (priv->individual_store,
-      EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DRAG |
-      EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_DROP |
-      EMPATHY_INDIVIDUAL_VIEW_FEATURE_PERSONA_DROP,
-      EMPATHY_INDIVIDUAL_FEATURE_NONE);
-  empathy_individual_view_set_show_offline (priv->individual_view, TRUE);
-  empathy_individual_view_set_show_untrusted (priv->individual_view, FALSE);
-
-  g_signal_connect (priv->individual_view, "row-activated",
-      (GCallback) row_activated_cb, self);
-  g_signal_connect (priv->individual_view, "drag-motion",
-      (GCallback) individual_view_drag_motion_cb, self);
-  g_signal_connect (priv->individual_view, "drag-persona-received",
-      (GCallback) individual_view_drag_persona_received_cb, self);
-
-  /* Add a checkbox column to the selector */
-  priv->toggle_renderer = gtk_cell_renderer_toggle_new ();
-  g_signal_connect (priv->toggle_renderer, "toggled",
-      (GCallback) row_toggled_cb, self);
-
-  priv->toggle_column = gtk_tree_view_column_new ();
-  gtk_tree_view_column_pack_start (priv->toggle_column, priv->toggle_renderer,
-      FALSE);
-  gtk_tree_view_column_set_cell_data_func (priv->toggle_column,
-      priv->toggle_renderer,
-      (GtkTreeCellDataFunc) contact_toggle_cell_data_func, self, NULL);
-
-  gtk_tree_view_insert_column (GTK_TREE_VIEW (priv->individual_view),
-      priv->toggle_column, 0);
-
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-      GTK_SHADOW_IN);
-  gtk_container_add (GTK_CONTAINER (scrolled_window),
-      GTK_WIDGET (priv->individual_view));
-  gtk_widget_show (GTK_WIDGET (priv->individual_view));
-
-  gtk_box_pack_start (vbox, scrolled_window, TRUE, TRUE, 0);
-  gtk_widget_show (scrolled_window);
-
-  /* Live search */
-  priv->search_widget = empathy_live_search_new (
-      GTK_WIDGET (priv->individual_view));
-  empathy_individual_view_set_live_search (priv->individual_view,
-      EMPATHY_LIVE_SEARCH (priv->search_widget));
-
-  gtk_box_pack_end (vbox, priv->search_widget, FALSE, TRUE, 0);
-
-  gtk_container_add (GTK_CONTAINER (alignment), GTK_WIDGET (vbox));
-  gtk_paned_pack1 (paned, alignment, TRUE, FALSE);
-  gtk_widget_show (GTK_WIDGET (vbox));
-
-  /* Right column heading */
-  alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 6, 0);
-  gtk_widget_show (alignment);
-
-  vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6));
-  label = gtk_label_new (NULL);
-  tmp = g_strdup_printf ("<b>%s</b>", _("New contact preview"));
-  gtk_label_set_markup (GTK_LABEL (label), tmp);
-  g_free (tmp);
-  gtk_box_pack_start (vbox, label, FALSE, TRUE, 0);
-  gtk_widget_show (label);
-
-  /* New individual preview */
-  priv->preview_widget = empathy_individual_widget_new (priv->new_individual,
-      EMPATHY_INDIVIDUAL_WIDGET_SHOW_DETAILS);
-  gtk_box_pack_start (vbox, priv->preview_widget, FALSE, TRUE, 0);
-  gtk_widget_show (priv->preview_widget);
-
-  /* Persona list */
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-      GTK_SHADOW_IN);
-
-  priv->persona_store = empathy_persona_store_new (priv->new_individual);
-  empathy_persona_store_set_show_protocols (priv->persona_store, TRUE);
-  persona_view = empathy_persona_view_new (priv->persona_store,
-      EMPATHY_PERSONA_VIEW_FEATURE_ALL);
-  empathy_persona_view_set_show_offline (persona_view, TRUE);
-
-  g_signal_connect (persona_view, "drag-individual-received",
-      (GCallback) persona_view_drag_individual_received_cb, self);
-
-  gtk_container_add (GTK_CONTAINER (scrolled_window),
-      GTK_WIDGET (persona_view));
-  gtk_widget_show (GTK_WIDGET (persona_view));
-
-  gtk_box_pack_start (vbox, scrolled_window, TRUE, TRUE, 0);
-  gtk_widget_show (scrolled_window);
-
-  gtk_container_add (GTK_CONTAINER (alignment), GTK_WIDGET (vbox));
-  gtk_paned_pack2 (paned, alignment, TRUE, FALSE);
-  gtk_widget_show (GTK_WIDGET (vbox));
-
-  gtk_widget_show (GTK_WIDGET (paned));
-
-  /* Footer label */
-  label = gtk_label_new (NULL);
-  tmp = g_strdup_printf ("<i>%s</i>",
-      _("Contacts selected in the list on the left will be linked together."));
-  gtk_label_set_markup (GTK_LABEL (label), tmp);
-  g_free (tmp);
-  gtk_widget_show (label);
-
-  gtk_box_pack_start (GTK_BOX (top_vbox), GTK_WIDGET (paned), TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, TRUE, 0);
-
-  /* Add the main vbox to the bin */
-  gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (top_vbox), TRUE, TRUE, 0);
-  gtk_widget_show (GTK_WIDGET (top_vbox));
-}
-
-static void
-empathy_individual_linker_init (EmpathyIndividualLinker *self)
-{
-  EmpathyIndividualLinkerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_INDIVIDUAL_LINKER, EmpathyIndividualLinkerPriv);
-
-  self->priv = priv;
-
-  priv->changed_individuals = g_hash_table_new (NULL, NULL);
-
-  set_up (self);
-}
-
-static void
-get_property (GObject *object,
-    guint param_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyIndividualLinkerPriv *priv;
-
-  priv = GET_PRIV (object);
-
-  switch (param_id)
-    {
-      case PROP_START_INDIVIDUAL:
-        g_value_set_object (value, priv->start_individual);
-        break;
-      case PROP_HAS_CHANGED:
-        g_value_set_boolean (value, empathy_individual_linker_get_has_changed (
-            EMPATHY_INDIVIDUAL_LINKER (object)));
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-set_property (GObject *object,
-    guint param_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  switch (param_id)
-    {
-      case PROP_START_INDIVIDUAL:
-        empathy_individual_linker_set_start_individual (
-            EMPATHY_INDIVIDUAL_LINKER (object), g_value_get_object (value));
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-dispose (GObject *object)
-{
-  EmpathyIndividualLinkerPriv *priv = GET_PRIV (object);
-
-  tp_clear_object (&priv->individual_store);
-  tp_clear_object (&priv->persona_store);
-  tp_clear_object (&priv->start_individual);
-  tp_clear_object (&priv->new_individual);
-
-  G_OBJECT_CLASS (empathy_individual_linker_parent_class)->dispose (object);
-}
-
-static void
-finalize (GObject *object)
-{
-  EmpathyIndividualLinkerPriv *priv = GET_PRIV (object);
-
-  g_hash_table_unref (priv->changed_individuals);
-
-  G_OBJECT_CLASS (empathy_individual_linker_parent_class)->finalize (object);
-}
-
-static void
-empathy_individual_linker_class_init (EmpathyIndividualLinkerClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->get_property = get_property;
-  object_class->set_property = set_property;
-  object_class->dispose = dispose;
-  object_class->finalize = finalize;
-
-  /**
-   * EmpathyIndividualLinker:start-individual:
-   *
-   * The #FolksIndividual to link other individuals to. This individual is
-   * selected by default in the list of individuals, and cannot be unselected.
-   * This ensures that empathy_individual_linker_get_linked_personas() will
-   * always return at least one persona to link.
-   */
-  g_object_class_install_property (object_class, PROP_START_INDIVIDUAL,
-      g_param_spec_object ("start-individual",
-          "Start Individual",
-          "The #FolksIndividual to link other individuals to.",
-          FOLKS_TYPE_INDIVIDUAL,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  /**
-   * EmpathyIndividualLinker:has-changed:
-   *
-   * Whether #FolksIndividual<!-- -->s have been added to or removed from
-   * the linked individual currently displayed in the widget.
-   *
-   * This will be %FALSE after the widget is initialised, and set to %TRUE when
-   * an individual is checked in the individual view on the left of the widget.
-   * If the individual is later unchecked, this will be reset to %FALSE, etc.
-   */
-  g_object_class_install_property (object_class, PROP_HAS_CHANGED,
-      g_param_spec_boolean ("has-changed",
-          "Changed?",
-          "Whether individuals have been added to or removed from the linked "
-          "individual currently displayed in the widget.",
-          FALSE,
-          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
-  g_type_class_add_private (object_class, sizeof (EmpathyIndividualLinkerPriv));
-}
-
-/**
- * empathy_individual_linker_new:
- * @start_individual: (allow-none): the #FolksIndividual to link to, or %NULL
- *
- * Creates a new #EmpathyIndividualLinker.
- *
- * Return value: a new #EmpathyIndividualLinker
- */
-GtkWidget *
-empathy_individual_linker_new (FolksIndividual *start_individual)
-{
-  g_return_val_if_fail (start_individual == NULL ||
-      FOLKS_IS_INDIVIDUAL (start_individual), NULL);
-
-  return g_object_new (EMPATHY_TYPE_INDIVIDUAL_LINKER,
-      "start-individual", start_individual,
-      NULL);
-}
-
-/**
- * empathy_individual_linker_get_start_individual:
- * @self: an #EmpathyIndividualLinker
- *
- * Get the value of #EmpathyIndividualLinker:start-individual.
- *
- * Return value: (transfer none): the start individual for linking, or %NULL
- */
-FolksIndividual *
-empathy_individual_linker_get_start_individual (EmpathyIndividualLinker *self)
-{
-  g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_LINKER (self), NULL);
-
-  return GET_PRIV (self)->start_individual;
-}
-
-/**
- * empathy_individual_linker_set_start_individual:
- * @self: an #EmpathyIndividualLinker
- * @individual: (allow-none): the start individual, or %NULL
- *
- * Set the value of #EmpathyIndividualLinker:start-individual to @individual.
- */
-void
-empathy_individual_linker_set_start_individual (EmpathyIndividualLinker *self,
-    FolksIndividual *individual)
-{
-  EmpathyIndividualLinkerPriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_INDIVIDUAL_LINKER (self));
-  g_return_if_fail (individual == NULL || FOLKS_IS_INDIVIDUAL (individual));
-
-  priv = GET_PRIV (self);
-
-  tp_clear_object (&priv->start_individual);
-  tp_clear_object (&priv->new_individual);
-  g_hash_table_remove_all (priv->changed_individuals);
-
-  if (individual != NULL)
-    {
-      priv->start_individual = g_object_ref (individual);
-      priv->new_individual = folks_individual_new (
-          folks_individual_get_personas (individual));
-      empathy_individual_view_set_store (priv->individual_view,
-          priv->individual_store);
-    }
-  else
-    {
-      priv->start_individual = NULL;
-      priv->new_individual = NULL;
-
-      /* We only display Individuals in the individual view if we have a
-       * new_individual to link them into */
-      empathy_individual_view_set_store (priv->individual_view, NULL);
-    }
-
-  empathy_individual_widget_set_individual (
-      EMPATHY_INDIVIDUAL_WIDGET (priv->preview_widget), priv->new_individual);
-  empathy_persona_store_set_individual (priv->persona_store,
-      priv->new_individual);
-
-  g_object_freeze_notify (G_OBJECT (self));
-  g_object_notify (G_OBJECT (self), "start-individual");
-  g_object_notify (G_OBJECT (self), "has-changed");
-  g_object_thaw_notify (G_OBJECT (self));
-}
-
-/**
- * empathy_individual_linker_get_linked_personas:
- * @self: an #EmpathyIndividualLinker
- *
- * Return a list of the #FolksPersona<!-- -->s which comprise the linked
- * individual currently displayed in the widget.
- *
- * The return value is guaranteed to contain at least one element.
- *
- * Return value: (transfer none) (element-type Folks.Persona): a set of
- * #FolksPersona<!-- -->s to link together
- */
-GeeSet *
-empathy_individual_linker_get_linked_personas (EmpathyIndividualLinker *self)
-{
-  EmpathyIndividualLinkerPriv *priv;
-  GeeSet *personas;
-
-  g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_LINKER (self), NULL);
-
-  priv = GET_PRIV (self);
-
-  if (priv->new_individual == NULL)
-    return NULL;
-
-  personas = folks_individual_get_personas (priv->new_individual);
-  g_assert (personas != NULL);
-  return personas;
-}
-
-/**
- * empathy_individual_linker_get_has_changed:
- * @self: an #EmpathyIndividualLinker
- *
- * Return whether #FolksIndividual<!-- -->s have been added to or removed from
- * the linked individual currently displayed in the widget.
- *
- * This will be %FALSE after the widget is initialised, and set to %TRUE when
- * an individual is checked in the individual view on the left of the widget.
- * If the individual is later unchecked, this will be reset to %FALSE, etc.
- *
- * Return value: %TRUE if the linked individual has been changed, %FALSE
- * otherwise
- */
-gboolean
-empathy_individual_linker_get_has_changed (EmpathyIndividualLinker *self)
-{
-  EmpathyIndividualLinkerPriv *priv;
-
-  g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_LINKER (self), FALSE);
-
-  priv = GET_PRIV (self);
-
-  return (g_hash_table_size (priv->changed_individuals) > 0) ? TRUE : FALSE;
-}
-
-void
-empathy_individual_linker_set_search_text (EmpathyIndividualLinker *self,
-    const gchar *search_text)
-{
-  g_return_if_fail (EMPATHY_IS_INDIVIDUAL_LINKER (self));
-
-  empathy_live_search_set_text (
-      EMPATHY_LIVE_SEARCH (GET_PRIV (self)->search_widget), search_text);
-}
diff --git a/libempathy-gtk/empathy-individual-linker.h b/libempathy-gtk/empathy-individual-linker.h
deleted file mode 100644
index 3079fa091..000000000
--- a/libempathy-gtk/empathy-individual-linker.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Philip Withnall <philip.withnall@collabora.co.uk>
- */
-
-#ifndef __EMPATHY_INDIVIDUAL_LINKER_H__
-#define __EMPATHY_INDIVIDUAL_LINKER_H__
-
-#include <gtk/gtk.h>
-
-#include <folks/folks.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_INDIVIDUAL_LINKER (empathy_individual_linker_get_type ())
-#define EMPATHY_INDIVIDUAL_LINKER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
-    EMPATHY_TYPE_INDIVIDUAL_LINKER, EmpathyIndividualLinker))
-#define EMPATHY_INDIVIDUAL_LINKER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), \
-    EMPATHY_TYPE_INDIVIDUAL_LINKER, EmpathyIndividualLinkerClass))
-#define EMPATHY_IS_INDIVIDUAL_LINKER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
-    EMPATHY_TYPE_INDIVIDUAL_LINKER))
-#define EMPATHY_IS_INDIVIDUAL_LINKER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
-    EMPATHY_TYPE_INDIVIDUAL_LINKER))
-#define EMPATHY_INDIVIDUAL_LINKER_GET_CLASS(o) ( \
-    G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_INDIVIDUAL_LINKER, \
-        EmpathyIndividualLinkerClass))
-
-typedef struct {
-	GtkBox parent;
-
-	/*<private>*/
-	gpointer priv;
-} EmpathyIndividualLinker;
-
-typedef struct {
-	GtkBoxClass parent_class;
-} EmpathyIndividualLinkerClass;
-
-GType empathy_individual_linker_get_type (void) G_GNUC_CONST;
-GtkWidget * empathy_individual_linker_new (FolksIndividual *start_individual);
-
-FolksIndividual * empathy_individual_linker_get_start_individual (
-    EmpathyIndividualLinker *self);
-void empathy_individual_linker_set_start_individual (
-    EmpathyIndividualLinker *self,
-    FolksIndividual *individual);
-
-GeeSet * empathy_individual_linker_get_linked_personas (
-    EmpathyIndividualLinker *self);
-
-gboolean empathy_individual_linker_get_has_changed (
-    EmpathyIndividualLinker *self);
-
-void empathy_individual_linker_set_search_text (EmpathyIndividualLinker *self,
-    const gchar *search_text);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_INDIVIDUAL_LINKER_H__ */
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 7ea0a4d2a..7b8da52d1 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -26,6 +26,8 @@
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
+#include <gio/gdesktopappinfo.h>
+
 #include <telepathy-glib/util.h>
 
 #include <folks/folks.h>
@@ -37,6 +39,7 @@
 #include <libempathy/empathy-chatroom-manager.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-contact-list.h>
+#include <libempathy/empathy-pkg-kit.h>
 
 #include "empathy-account-selector-dialog.h"
 #include "empathy-individual-menu.h"
@@ -46,10 +49,8 @@
 #include "empathy-gtk-enum-types.h"
 #include "empathy-individual-dialogs.h"
 #include "empathy-individual-edit-dialog.h"
-#include "empathy-individual-information-dialog.h"
 #include "empathy-ui-utils.h"
 #include "empathy-share-my-desktop.h"
-#include "empathy-linking-dialog.h"
 #include "empathy-call-utils.h"
 #include "empathy-individual-store-channel.h"
 
@@ -70,13 +71,6 @@ enum {
   PROP_STORE,
 };
 
-enum {
-  SIGNAL_LINK_CONTACTS_ACTIVATED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
 G_DEFINE_TYPE (EmpathyIndividualMenu, empathy_individual_menu, GTK_TYPE_MENU);
 
 static GtkWidget * empathy_individual_chat_menu_item_new (
@@ -89,8 +83,6 @@ static GtkWidget * empathy_individual_info_menu_item_new (
     FolksIndividual *individual);
 static GtkWidget * empathy_individual_edit_menu_item_new (
     FolksIndividual *individual);
-static GtkWidget * empathy_individual_link_menu_item_new (
-    FolksIndividual *individual);
 static GtkWidget * empathy_individual_invite_menu_item_new (
     FolksIndividual *individual,
     EmpathyContact *contact);
@@ -145,7 +137,6 @@ individual_menu_add_personas (GtkMenuShell *menu,
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show (item);
 
-  personas = folks_individual_get_personas (individual);
   for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter))
     {
       GtkWidget *image;
@@ -276,16 +267,6 @@ while_finish:
 }
 
 static void
-individual_link_menu_item_activate_cb (EmpathyIndividualMenu *self)
-{
-  EmpathyIndividualMenuPriv *priv = GET_PRIV (self);
-  GtkWidget *dialog;
-
-  dialog = empathy_linking_dialog_show (priv->individual, NULL);
-  g_signal_emit (self, signals[SIGNAL_LINK_CONTACTS_ACTIVATED], 0, dialog);
-}
-
-static void
 empathy_individual_menu_init (EmpathyIndividualMenu *self)
 {
   EmpathyIndividualMenuPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
@@ -784,8 +765,7 @@ constructed (GObject *object)
   /* Separator */
   if (features & (EMPATHY_INDIVIDUAL_FEATURE_EDIT |
       EMPATHY_INDIVIDUAL_FEATURE_INFO |
-      EMPATHY_INDIVIDUAL_FEATURE_FAVOURITE |
-      EMPATHY_INDIVIDUAL_FEATURE_LINK))
+      EMPATHY_INDIVIDUAL_FEATURE_FAVOURITE))
     {
       item = gtk_separator_menu_item_new ();
       gtk_menu_shell_append (shell, item);
@@ -800,18 +780,6 @@ constructed (GObject *object)
       gtk_widget_show (item);
     }
 
-  /* Link */
-  if (features & EMPATHY_INDIVIDUAL_FEATURE_LINK)
-    {
-      item = empathy_individual_link_menu_item_new (individual);
-      gtk_menu_shell_append (shell, item);
-
-      g_signal_connect_swapped (item, "activate",
-          (GCallback) individual_link_menu_item_activate_cb, object);
-
-      gtk_widget_show (item);
-    }
-
   /* Log */
   if (features & EMPATHY_INDIVIDUAL_FEATURE_LOG)
     {
@@ -957,12 +925,6 @@ empathy_individual_menu_class_init (EmpathyIndividualMenuClass *klass)
           EMPATHY_TYPE_INDIVIDUAL_STORE,
           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
-  signals[SIGNAL_LINK_CONTACTS_ACTIVATED] =
-      g_signal_new ("link-contacts-activated", G_OBJECT_CLASS_TYPE (klass),
-          G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_generic,
-          G_TYPE_NONE, 1, EMPATHY_TYPE_LINKING_DIALOG);
-
   g_type_class_add_private (object_class, sizeof (EmpathyIndividualMenuPriv));
 }
 
@@ -1292,9 +1254,117 @@ empathy_individual_favourite_menu_item_new (FolksIndividual *individual)
 }
 
 static void
-individual_info_menu_item_activate_cb (FolksIndividual *individual)
+show_gnome_contacts_error_dialog (void)
+{
+  GtkWidget *dialog;
+
+  dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+      GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+      _("gnome-contacts not installed"));
+
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+      _("Please install gnome-contacts to access contacts details."));
+
+  g_signal_connect_swapped (dialog, "response",
+          G_CALLBACK (gtk_widget_destroy), dialog);
+
+  gtk_widget_show (dialog);
+}
+
+static void
+start_gnome_contacts (FolksIndividual *individual,
+    gboolean try_installing);
+
+static void
+install_gnome_contacts_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  FolksIndividual *individual = user_data;
+  GError *error = NULL;
+
+  if (!empathy_pkg_kit_install_packages_finish (result, &error))
+    {
+      DEBUG ("Failed to install gnome-contacts: %s", error->message);
+      g_error_free (error);
+
+      show_gnome_contacts_error_dialog ();
+      goto out;
+    }
+
+  DEBUG ("gnome-contacts installed");
+
+  start_gnome_contacts (individual, FALSE);
+
+out:
+  g_object_unref (individual);
+}
+
+static void
+start_gnome_contacts (FolksIndividual *individual,
+    gboolean try_installing)
+{
+  GDesktopAppInfo *desktop_info;
+  gchar *cmd;
+  GAppInfo *app_info;
+  GError *error = NULL;
+  GdkAppLaunchContext *context = NULL;
+  GdkDisplay *display;
+
+  g_return_if_fail (FOLKS_IS_INDIVIDUAL (individual));
+
+  /* Start gnome-contacts */
+  display = gdk_display_get_default ();
+  context = gdk_display_get_app_launch_context (display);
+
+  desktop_info = g_desktop_app_info_new ("gnome-contacts.desktop");
+  if (desktop_info == NULL)
+    {
+      if (try_installing)
+        {
+          const gchar *packages[] = { "gnome-contacts", NULL };
+
+          DEBUG ("gnome-contacts not installed; try to install it");
+
+          empathy_pkg_kit_install_packages_async (0, packages, NULL,
+              NULL, install_gnome_contacts_cb, g_object_ref (individual));
+        }
+      else
+        {
+          show_gnome_contacts_error_dialog ();
+        }
+
+      return;
+    }
+
+  /* glib doesn't have API to start a desktop file with args... (#637875) */
+  cmd = g_strdup_printf ("%s -i %s", g_app_info_get_commandline (
+        (GAppInfo *) desktop_info), folks_individual_get_id (individual));
+
+  app_info = g_app_info_create_from_commandline (cmd, NULL, 0, &error);
+  if (app_info == NULL)
+    {
+      DEBUG ("Failed to create app_info: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
+        &error))
+    {
+      g_critical ("Failed to start gnome-contacts: %s", error->message);
+      g_error_free (error);
+    }
+
+  g_object_unref (desktop_info);
+  g_object_unref (app_info);
+}
+
+static void
+individual_info_menu_item_activate_cb (GtkMenuItem *item,
+    FolksIndividual *individual)
 {
-  empathy_individual_information_dialog_show (individual, NULL);
+  start_gnome_contacts (individual, TRUE);
 }
 
 static GtkWidget *
@@ -1313,7 +1383,7 @@ empathy_individual_info_menu_item_new (FolksIndividual *individual)
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
   gtk_widget_show (image);
 
-  g_signal_connect_swapped (item, "activate",
+  g_signal_connect (item, "activate",
           G_CALLBACK (individual_info_menu_item_activate_cb),
           individual);
 
@@ -1371,31 +1441,6 @@ empathy_individual_edit_menu_item_new (FolksIndividual *individual)
   return item;
 }
 
-static GtkWidget *
-empathy_individual_link_menu_item_new (FolksIndividual *individual)
-{
-  GtkWidget *item;
-  /*GtkWidget *image;*/
-
-  g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
-
-  item = gtk_image_menu_item_new_with_mnemonic (
-      /* Translators: this is a verb meaning "to connect two contacts together
-       * to form a meta-contact". */
-      C_("Link individual (contextual menu)", "_Link Contacts…"));
-  /* TODO */
-  /*image = gtk_image_new_from_icon_name (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-  gtk_widget_show (image);*/
-
-  /* Only allow trusted Individuals to be linked */
-  gtk_widget_set_sensitive (item,
-      folks_individual_get_trust_level (individual) ==
-          FOLKS_TRUST_LEVEL_PERSONAS);
-
-  return item;
-}
-
 typedef struct
 {
   FolksIndividual *individual;
diff --git a/libempathy-gtk/empathy-individual-menu.h b/libempathy-gtk/empathy-individual-menu.h
index 71cedda34..a2187da6b 100644
--- a/libempathy-gtk/empathy-individual-menu.h
+++ b/libempathy-gtk/empathy-individual-menu.h
@@ -37,11 +37,10 @@ typedef enum {
 	EMPATHY_INDIVIDUAL_FEATURE_EDIT = 1 << 3,
 	EMPATHY_INDIVIDUAL_FEATURE_INFO = 1 << 4,
 	EMPATHY_INDIVIDUAL_FEATURE_FAVOURITE = 1 << 5,
-	EMPATHY_INDIVIDUAL_FEATURE_LINK = 1 << 6,
-	EMPATHY_INDIVIDUAL_FEATURE_SMS = 1 << 7,
-	EMPATHY_INDIVIDUAL_FEATURE_CALL_PHONE = 1 << 8,
-	EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT = 1 << 9,
-	EMPATHY_INDIVIDUAL_FEATURE_BLOCK = 1 << 10,
+	EMPATHY_INDIVIDUAL_FEATURE_SMS = 1 << 6,
+	EMPATHY_INDIVIDUAL_FEATURE_CALL_PHONE = 1 << 7,
+	EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT = 1 << 8,
+	EMPATHY_INDIVIDUAL_FEATURE_BLOCK = 1 << 9,
 } EmpathyIndividualFeatureFlags;
 
 #define EMPATHY_TYPE_INDIVIDUAL_MENU (empathy_individual_menu_get_type ())
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index aa3f6334d..c22e11149 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -330,94 +330,100 @@ void
 empathy_individual_store_add_individual (EmpathyIndividualStore *self,
     FolksIndividual *individual)
 {
-  GtkTreeIter iter;
-  GeeIterator *group_iter = NULL;
+  GtkTreeIter iter, iter_group;
+  GeeSet *group_set = NULL;
+  gboolean grouped = FALSE;
 
   if (EMP_STR_EMPTY (folks_alias_details_get_alias (
           FOLKS_ALIAS_DETAILS (individual))))
     return;
 
-  if (self->priv->show_groups)
+  if (!self->priv->show_groups)
     {
-      GeeSet *group_set = NULL;
-
-      group_set = folks_group_details_get_groups (
-          FOLKS_GROUP_DETAILS (individual));
+      /* add our individual to the toplevel of the store */
+      add_individual_to_store (GTK_TREE_STORE (self), &iter, NULL,
+          individual);
 
-      if (gee_collection_get_size (GEE_COLLECTION (group_set)) > 0)
-        group_iter = gee_iterable_iterator (GEE_ITERABLE (group_set));
+      goto finally;
     }
 
-  /* fall-back groups, in case there are no named groups */
-  if (group_iter == NULL)
+  group_set = folks_group_details_get_groups (
+      FOLKS_GROUP_DETAILS (individual));
+
+  if (gee_collection_get_size (GEE_COLLECTION (group_set)) > 0)
+    {
+      /* add the contact to its groups */
+      GeeIterator *group_iter =
+        gee_iterable_iterator (GEE_ITERABLE (group_set));
+
+      while (group_iter != NULL && gee_iterator_next (group_iter))
+        {
+          gchar *group_name = gee_iterator_get (group_iter);
+
+          individual_store_get_group (self, group_name, &iter_group,
+              NULL, NULL, FALSE);
+
+          add_individual_to_store (GTK_TREE_STORE (self), &iter, &iter_group,
+              individual);
+          grouped = TRUE;
+
+          g_free (group_name);
+        }
+
+      g_clear_object (&group_iter);
+    }
+  else
     {
-      GtkTreeIter iter_group, *parent;
+      /* fall-back groups, in case there are no named groups */
       EmpathyContact *contact;
       TpConnection *connection;
-      gchar *protocol_name = NULL;
-
-      parent = &iter_group;
+      const gchar *protocol_name = NULL;
 
       contact = empathy_contact_dup_from_folks_individual (individual);
       if (contact != NULL)
         {
           connection = empathy_contact_get_connection (contact);
-          tp_connection_parse_object_path (connection, &protocol_name, NULL);
+          protocol_name = tp_connection_get_protocol_name (connection);
         }
 
-      if (!self->priv->show_groups)
-        parent = NULL;
-      else if (!tp_strdiff (protocol_name, "local-xmpp"))
+      if (!tp_strdiff (protocol_name, "local-xmpp"))
         {
           /* these are People Nearby */
           individual_store_get_group (self,
               EMPATHY_INDIVIDUAL_STORE_PEOPLE_NEARBY, &iter_group, NULL, NULL,
               TRUE);
+          add_individual_to_store (GTK_TREE_STORE (self), &iter, &iter_group,
+              individual);
+          grouped = TRUE;
         }
-      else
-        {
-          individual_store_get_group (self,
-              EMPATHY_INDIVIDUAL_STORE_UNGROUPED,
-              &iter_group, NULL, NULL, TRUE);
-        }
-
-      add_individual_to_store (GTK_TREE_STORE (self), &iter, parent,
-          individual);
 
-      g_free (protocol_name);
       g_clear_object (&contact);
     }
 
-  /* Else add to each group. */
-  while (group_iter != NULL && gee_iterator_next (group_iter))
+  if (folks_favourite_details_get_is_favourite (
+        FOLKS_FAVOURITE_DETAILS (individual)))
     {
-      gchar *group_name = gee_iterator_get (group_iter);
-      GtkTreeIter iter_group;
-
-      individual_store_get_group (self, group_name, &iter_group, NULL, NULL,
-          FALSE);
+      /* Add contact to the fake 'Favorites' group */
+      individual_store_get_group (self, EMPATHY_INDIVIDUAL_STORE_FAVORITE,
+          &iter_group, NULL, NULL, TRUE);
 
       add_individual_to_store (GTK_TREE_STORE (self), &iter, &iter_group,
           individual);
-
-      g_free (group_name);
+      grouped = TRUE;
     }
-  g_clear_object (&group_iter);
 
-  if (self->priv->show_groups &&
-      folks_favourite_details_get_is_favourite (
-          FOLKS_FAVOURITE_DETAILS (individual)))
+  if (!grouped)
     {
-      /* Add contact to the fake 'Favorites' group */
-      GtkTreeIter iter_group;
-
-      individual_store_get_group (self, EMPATHY_INDIVIDUAL_STORE_FAVORITE,
+      /* Else add the contact to 'Ungrouped' */
+      individual_store_get_group (self,
+          EMPATHY_INDIVIDUAL_STORE_UNGROUPED,
           &iter_group, NULL, NULL, TRUE);
-
       add_individual_to_store (GTK_TREE_STORE (self), &iter, &iter_group,
           individual);
     }
 
+
+finally:
   individual_store_contact_update (self, individual);
 }
 
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index dad975b3c..34ca7c09f 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -49,7 +49,6 @@
 #include "empathy-individual-edit-dialog.h"
 #include "empathy-individual-dialogs.h"
 #include "empathy-images.h"
-#include "empathy-linking-dialog.h"
 #include "empathy-cell-renderer-expander.h"
 #include "empathy-cell-renderer-text.h"
 #include "empathy-cell-renderer-activatable.h"
@@ -892,6 +891,12 @@ individual_view_drag_end (GtkWidget *widget,
       gtk_tree_row_reference_free (priv->drag_row);
       priv->drag_row = NULL;
     }
+
+  if (priv->auto_scroll_timeout_id != 0)
+    {
+      g_source_remove (priv->auto_scroll_timeout_id);
+      priv->auto_scroll_timeout_id = 0;
+    }
 }
 
 static gboolean
@@ -2531,19 +2536,6 @@ individual_view_remove_activate_cb (GtkMenuItem *menuitem,
     }
 }
 
-static void
-individual_menu_link_contacts_activated_cb (EmpathyIndividualMenu *menu,
-    EmpathyLinkingDialog *linking_dialog,
-    EmpathyIndividualView *self)
-{
-  EmpathyIndividualViewPriv *priv = GET_PRIV (self);
-  EmpathyIndividualLinker *linker;
-
-  linker = empathy_linking_dialog_get_individual_linker (linking_dialog);
-  empathy_individual_linker_set_search_text (linker,
-      empathy_live_search_get_text (EMPATHY_LIVE_SEARCH (priv->search_widget)));
-}
-
 GtkWidget *
 empathy_individual_view_get_individual_menu (EmpathyIndividualView *view)
 {
@@ -2618,12 +2610,6 @@ empathy_individual_view_get_individual_menu (EmpathyIndividualView *view)
           G_CALLBACK (individual_view_remove_activate_cb), view);
     }
 
-  /* Connect to EmpathyIndividualMenu::link-contacts-activated so that we can
-   * set the live search text on the new linking dialogue to be the same as
-   * our own. */
-  g_signal_connect (menu, "link-contacts-activated",
-      (GCallback) individual_menu_link_contacts_activated_cb, view);
-
 out:
   g_object_unref (individual);
 
diff --git a/libempathy-gtk/empathy-linking-dialog.c b/libempathy-gtk/empathy-linking-dialog.c
deleted file mode 100644
index 350bfdc22..000000000
--- a/libempathy-gtk/empathy-linking-dialog.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Philip Withnall <philip.withnall@collabora.co.uk>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-linking-dialog.h"
-#include "empathy-individual-linker.h"
-#include "empathy-ui-utils.h"
-
-/**
- * SECTION:empathy-individual-widget
- * @title:EmpathyLinkingDialog
- * @short_description: A dialog used to link individuals together
- * @include: libempathy-empathy-linking-dialog.h
- *
- * #EmpathyLinkingDialog is a dialog which allows selection of individuals to
- * link together, and preview of the newly linked individual. When submitted, it
- * pushes the new links to backing storage.
- */
-
-/**
- * EmpathyLinkingDialog:
- * @parent: parent object
- *
- * Widget which displays appropriate widgets with details about an individual,
- * also allowing changing these details, if desired.
- *
- * Currently, it's just a thin wrapper around #EmpathyContactWidget, and
- * displays the details of the first eligible persona found in the individual.
- */
-
-static GtkWidget *linking_dialog = NULL;
-
-/* Fairly arbitrary response ID for the "Unlink" button */
-#define RESPONSE_UNLINK 5
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLinkingDialog)
-
-typedef struct {
-  EmpathyIndividualLinker *linker; /* child widget */
-  GtkWidget *link_button; /* child widget */
-} EmpathyLinkingDialogPriv;
-
-G_DEFINE_TYPE (EmpathyLinkingDialog, empathy_linking_dialog,
-    GTK_TYPE_DIALOG);
-
-static void
-linker_notify_has_changed_cb (EmpathyIndividualLinker *linker,
-    GParamSpec *pspec,
-    EmpathyLinkingDialog *self)
-{
-  EmpathyLinkingDialogPriv *priv = GET_PRIV (self);
-
-  /* Only make the "Link" button sensitive if the linked Individual has been
-   * changed. */
-  gtk_widget_set_sensitive (priv->link_button,
-      empathy_individual_linker_get_has_changed (linker));
-}
-
-static void
-empathy_linking_dialog_class_init (EmpathyLinkingDialogClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  g_type_class_add_private (object_class, sizeof (EmpathyLinkingDialogPriv));
-}
-
-static void
-empathy_linking_dialog_init (EmpathyLinkingDialog *self)
-{
-  EmpathyLinkingDialogPriv *priv;
-  GtkDialog *dialog;
-  GtkWidget *button;
-  GtkBox *content_area;
-
-  priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_LINKING_DIALOG, EmpathyLinkingDialogPriv);
-  self->priv = priv;
-
-  dialog = GTK_DIALOG (self);
-
-  /* Set up dialog */
-  gtk_window_set_resizable (GTK_WINDOW (self), TRUE);
-  /* 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. */
-  gtk_window_set_title (GTK_WINDOW (self), _("Link Contacts"));
-  gtk_widget_set_size_request (GTK_WIDGET (self), 600, 500);
-
-  /* Unlink button */
-  button = gtk_button_new_with_mnemonic (
-      C_("Unlink individual (button)", "_Unlink…"));
-  gtk_widget_set_tooltip_text (button, _("Completely split the displayed "
-      "linked contacts into the separate contacts."));
-  gtk_dialog_add_action_widget (dialog, button, RESPONSE_UNLINK);
-  gtk_widget_show (button);
-
-  /* Cancel button */
-  button = gtk_button_new_with_label (GTK_STOCK_CANCEL);
-  gtk_button_set_use_stock (GTK_BUTTON (button), TRUE);
-  gtk_dialog_add_action_widget (dialog, button, GTK_RESPONSE_CANCEL);
-  gtk_widget_show (button);
-
-  /* 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". */
-  priv->link_button = gtk_button_new_with_mnemonic (_("_Link"));
-  gtk_dialog_add_action_widget (dialog, priv->link_button, GTK_RESPONSE_OK);
-  gtk_widget_show (priv->link_button);
-
-  /* Linker widget */
-  priv->linker =
-      EMPATHY_INDIVIDUAL_LINKER (empathy_individual_linker_new (NULL));
-  g_signal_connect (priv->linker, "notify::has-changed",
-      (GCallback) linker_notify_has_changed_cb, self);
-
-  gtk_container_set_border_width (GTK_CONTAINER (priv->linker), 8);
-  content_area = GTK_BOX (gtk_dialog_get_content_area (dialog));
-  gtk_box_pack_start (content_area, GTK_WIDGET (priv->linker), TRUE, TRUE, 0);
-  gtk_widget_show (GTK_WIDGET (priv->linker));
-}
-
-static void
-linking_response_cb (EmpathyLinkingDialog *self,
-    gint response,
-    gpointer user_data)
-{
-  EmpathyLinkingDialogPriv *priv = GET_PRIV (self);
-
-  if (response == GTK_RESPONSE_OK)
-    {
-      EmpathyIndividualManager *manager;
-      GeeSet *personas;
-
-      manager = empathy_individual_manager_dup_singleton ();
-
-      personas = empathy_individual_linker_get_linked_personas (priv->linker);
-      empathy_individual_manager_link_personas (manager, personas);
-
-      g_object_unref (manager);
-    }
-  else if (response == RESPONSE_UNLINK)
-    {
-      EmpathyIndividualManager *manager;
-      FolksIndividual *individual;
-      GtkWidget *dialog;
-
-      individual =
-          empathy_individual_linker_get_start_individual (priv->linker);
-
-      /* Show a confirmation dialogue first */
-      dialog = gtk_message_dialog_new (GTK_WINDOW (self), GTK_DIALOG_MODAL,
-          GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
-          _("Unlink linked contacts '%s'?"),
-          folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)));
-      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-          _("Are you sure you want to unlink these linked contacts? This will "
-            "completely split the linked contacts into separate contacts."));
-      gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-          C_("Unlink individual (button)", "_Unlink"), GTK_RESPONSE_OK,
-          NULL);
-
-      if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
-        {
-          gtk_widget_destroy (dialog);
-          return;
-        }
-
-      gtk_widget_destroy (dialog);
-
-      manager = empathy_individual_manager_dup_singleton ();
-      empathy_individual_manager_unlink_individual (manager, individual);
-      g_object_unref (manager);
-    }
-
-  linking_dialog = NULL;
-  gtk_widget_destroy (GTK_WIDGET (self));
-}
-
-/**
- * empathy_linking_dialog_show:
- * @individual: the #FolksIndividual to start linking against
- * @parent: a parent window for the dialogue, or %NULL
- *
- * Create and show the linking dialogue, with @individual selected as the
- * individual to link to. If the dialogue is already being shown, raise it and
- * reset it so the start individual is @individual.
- *
- * Return value: the linking dialog
- */
-GtkWidget *
-empathy_linking_dialog_show (FolksIndividual *individual,
-    GtkWindow *parent)
-{
-  EmpathyLinkingDialogPriv *priv;
-  GeeSet *personas;
-  GeeIterator *iter;
-  guint num_personas = 0;
-
-  /* Create the dialogue if it doesn't exist */
-  if (linking_dialog == NULL)
-    {
-      linking_dialog = GTK_WIDGET (g_object_new (EMPATHY_TYPE_LINKING_DIALOG,
-          NULL));
-
-      g_signal_connect (linking_dialog, "response",
-          (GCallback) linking_response_cb, NULL);
-    }
-
-  priv = GET_PRIV (linking_dialog);
-
-  if (parent != NULL)
-    gtk_window_set_transient_for (GTK_WINDOW (linking_dialog), parent);
-
-  empathy_individual_linker_set_start_individual (priv->linker, individual);
-
-  /* Count how many Telepathy personas we have, to see whether we can
-   * unlink */
-  personas = folks_individual_get_personas (individual);
-  iter = gee_iterable_iterator (GEE_ITERABLE (personas));
-  while (gee_iterator_next (iter))
-    {
-      FolksPersona *persona = gee_iterator_get (iter);
-      if (empathy_folks_persona_is_interesting (persona))
-        num_personas++;
-
-      g_clear_object (&persona);
-    }
-  g_clear_object (&iter);
-
-  /* Only make the "Unlink" button sensitive if we have enough personas */
-  gtk_dialog_set_response_sensitive (GTK_DIALOG (linking_dialog),
-      RESPONSE_UNLINK, (num_personas > 1) ? TRUE : FALSE);
-
-  gtk_window_present (GTK_WINDOW (linking_dialog));
-
-  return linking_dialog;
-}
-
-EmpathyIndividualLinker *
-empathy_linking_dialog_get_individual_linker (EmpathyLinkingDialog *self)
-{
-  g_return_val_if_fail (EMPATHY_IS_LINKING_DIALOG (self), NULL);
-
-  return GET_PRIV (self)->linker;
-}
diff --git a/libempathy-gtk/empathy-linking-dialog.h b/libempathy-gtk/empathy-linking-dialog.h
deleted file mode 100644
index fb47641ca..000000000
--- a/libempathy-gtk/empathy-linking-dialog.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Philip Withnall <philip.withnall@collabora.co.uk>
- */
-
-#ifndef __EMPATHY_LINKING_DIALOG_H__
-#define __EMPATHY_LINKING_DIALOG_H__
-
-#include <gtk/gtk.h>
-
-#include <folks/folks.h>
-
-#include "empathy-individual-linker.h"
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_LINKING_DIALOG (empathy_linking_dialog_get_type ())
-#define EMPATHY_LINKING_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
-    EMPATHY_TYPE_LINKING_DIALOG, EmpathyLinkingDialog))
-#define EMPATHY_LINKING_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), \
-    EMPATHY_TYPE_LINKING_DIALOG, EmpathyLinkingDialogClass))
-#define EMPATHY_IS_LINKING_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
-    EMPATHY_TYPE_LINKING_DIALOG))
-#define EMPATHY_IS_LINKING_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
-    EMPATHY_TYPE_LINKING_DIALOG))
-#define EMPATHY_LINKING_DIALOG_GET_CLASS(o) ( \
-    G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_LINKING_DIALOG, \
-        EmpathyLinkingDialogClass))
-
-typedef struct {
-	GtkDialog parent;
-
-	/*<private>*/
-	gpointer priv;
-} EmpathyLinkingDialog;
-
-typedef struct {
-	GtkDialogClass parent_class;
-} EmpathyLinkingDialogClass;
-
-GType empathy_linking_dialog_get_type (void) G_GNUC_CONST;
-
-GtkWidget * empathy_linking_dialog_show (FolksIndividual *individual,
-    GtkWindow *parent);
-
-EmpathyIndividualLinker * empathy_linking_dialog_get_individual_linker (
-    EmpathyLinkingDialog *self);
-
-G_END_DECLS
-
-#endif /*  __EMPATHY_LINKING_DIALOG_H__ */
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
new file mode 100644
index 000000000..3a6c8ee1c
--- /dev/null
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -0,0 +1,309 @@
+/*
+ * empathy-local-xmpp-assistant-widget.h - Source for
+ * EmpathyLocalXmppAssistantWidget
+ *
+ * Copyright (C) 2012 - Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with This library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+#include "empathy-local-xmpp-assistant-widget.h"
+
+#include <glib/gi18n-lib.h>
+
+#if HAVE_EDS
+#include <libebook/e-book.h>
+#endif
+
+#include <libempathy/empathy-utils.h>
+
+#include <libempathy-gtk/empathy-account-widget.h>
+#include <libempathy-gtk/empathy-ui-utils.h>
+
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include <libempathy/empathy-debug.h>
+
+G_DEFINE_TYPE (EmpathyLocalXmppAssistantWidget,
+    empathy_local_xmpp_assistant_widget, GTK_TYPE_GRID)
+
+enum {
+  SIG_VALID = 1,
+  LAST_SIGNAL
+};
+
+static gulong signals[LAST_SIGNAL] = { 0, };
+
+struct _EmpathyLocalXmppAssistantWidgetPrivate
+{
+  EmpathyAccountSettings  *settings;
+};
+
+static void
+empathy_local_xmpp_assistant_widget_init (EmpathyLocalXmppAssistantWidget *self)
+{
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self),
+      EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET,
+      EmpathyLocalXmppAssistantWidgetPrivate);
+}
+
+static EmpathyAccountSettings *
+create_salut_account_settings (void)
+{
+  EmpathyAccountSettings  *settings;
+#if HAVE_EDS
+  EBook *book;
+  EContact *contact;
+  gchar *nickname = NULL;
+  gchar *first_name = NULL;
+  gchar *last_name = NULL;
+  gchar *email = NULL;
+  gchar *jid = NULL;
+  GError *error = NULL;
+#endif
+
+  settings = empathy_account_settings_new ("salut", "local-xmpp", NULL,
+      _("People nearby"));
+
+#if HAVE_EDS
+  /* Get self EContact from EDS */
+  if (!e_book_get_self (&contact, &book, &error))
+    {
+      DEBUG ("Failed to get self econtact: %s", error->message);
+      g_error_free (error);
+      return settings;
+    }
+
+  nickname = e_contact_get (contact, E_CONTACT_NICKNAME);
+  first_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME);
+  last_name = e_contact_get (contact, E_CONTACT_FAMILY_NAME);
+  email = e_contact_get (contact, E_CONTACT_EMAIL_1);
+  jid = e_contact_get (contact, E_CONTACT_IM_JABBER_HOME_1);
+
+  if (!tp_strdiff (nickname, "nickname"))
+    {
+      g_free (nickname);
+      nickname = NULL;
+    }
+
+  DEBUG ("Salut account created:\nnickname=%s\nfirst-name=%s\n"
+     "last-name=%s\nemail=%s\njid=%s\n",
+     nickname, first_name, last_name, email, jid);
+
+  empathy_account_settings_set_string (settings,
+      "nickname", nickname ? nickname : "");
+  empathy_account_settings_set_string (settings,
+      "first-name", first_name ? first_name : "");
+  empathy_account_settings_set_string (settings,
+      "last-name", last_name ? last_name : "");
+  empathy_account_settings_set_string (settings, "email", email ? email : "");
+  empathy_account_settings_set_string (settings, "jid", jid ? jid : "");
+
+  g_free (nickname);
+  g_free (first_name);
+  g_free (last_name);
+  g_free (email);
+  g_free (jid);
+  g_object_unref (contact);
+  g_object_unref (book);
+#endif
+
+  return settings;
+}
+
+static void
+handle_apply_cb (EmpathyAccountWidget *widget_object,
+    gboolean is_valid,
+    EmpathyLocalXmppAssistantWidget *self)
+{
+  g_signal_emit (self, signals[SIG_VALID], 0, is_valid);
+}
+
+static void
+empathy_local_xmpp_assistant_widget_constructed (GObject *object)
+{
+  EmpathyLocalXmppAssistantWidget *self = (EmpathyLocalXmppAssistantWidget *)
+    object;
+  GtkWidget *w;
+  GdkPixbuf *pix;
+  GtkWidget *account_widget;
+  EmpathyAccountWidget *widget_object;
+  gchar *markup;
+
+  G_OBJECT_CLASS (empathy_local_xmpp_assistant_widget_parent_class)->
+    constructed (object);
+
+  gtk_container_set_border_width (GTK_CONTAINER (self), 12);
+
+  w = gtk_label_new (
+      _("Empathy can automatically discover and chat with the people "
+        "connected on the same network as you. "
+        "If you want to use this feature, please check that the "
+        "details below are correct."));
+  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
+  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
+  gtk_grid_attach (GTK_GRID (self), w, 0, 0, 1, 1);
+  gtk_widget_show (w);
+
+  pix = empathy_pixbuf_from_icon_name_sized ("im-local-xmpp", 48);
+  w = gtk_image_new_from_pixbuf (pix);
+  gtk_grid_attach (GTK_GRID (self), w, 1, 0, 1, 1);
+  gtk_widget_show (w);
+
+  g_object_unref (pix);
+
+  self->priv->settings = create_salut_account_settings ();
+
+  widget_object = empathy_account_widget_new_for_protocol (self->priv->settings,
+      TRUE);
+  empathy_account_widget_hide_buttons (widget_object);
+
+  account_widget = empathy_account_widget_get_widget (widget_object);
+
+  g_signal_connect (widget_object, "handle-apply",
+      G_CALLBACK (handle_apply_cb), self);
+
+  gtk_grid_attach (GTK_GRID (self), account_widget, 0, 1, 2, 1);
+  gtk_widget_show (account_widget);
+
+  w = gtk_label_new (NULL);
+  markup = g_strdup_printf (
+      "<span size=\"small\">%s</span>",
+      _("You can change these details later or disable this feature "
+        "by choosing <span style=\"italic\">Edit → Accounts</span> "
+        "in the Contact List."));
+  gtk_label_set_markup (GTK_LABEL (w), markup);
+  g_free (markup);
+  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
+  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
+  gtk_grid_attach (GTK_GRID (self), w, 0, 2, 2, 1);
+  gtk_widget_show (w);
+}
+
+static void
+empathy_local_xmpp_assistant_widget_dispose (GObject *object)
+{
+  EmpathyLocalXmppAssistantWidget *self = (EmpathyLocalXmppAssistantWidget *)
+    object;
+
+  g_clear_object (&self->priv->settings);
+
+  G_OBJECT_CLASS (empathy_local_xmpp_assistant_widget_parent_class)->
+    dispose (object);
+}
+
+static void
+empathy_local_xmpp_assistant_widget_class_init (
+    EmpathyLocalXmppAssistantWidgetClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed = empathy_local_xmpp_assistant_widget_constructed;
+  object_class->dispose = empathy_local_xmpp_assistant_widget_dispose;
+
+  signals[SIG_VALID] =
+      g_signal_new ("valid",
+          G_TYPE_FROM_CLASS (klass),
+          G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+          g_cclosure_marshal_generic,
+          G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+  g_type_class_add_private (object_class,
+      sizeof (EmpathyLocalXmppAssistantWidgetPrivate));
+}
+
+GtkWidget *
+empathy_local_xmpp_assistant_widget_new ()
+{
+  return g_object_new (EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET,
+      "row-spacing", 12,
+      NULL);
+}
+
+static void
+account_enabled_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  TpAccount *account = TP_ACCOUNT (source);
+  GError *error = NULL;
+  TpAccountManager *account_mgr;
+
+  if (!tp_account_set_enabled_finish (account, result, &error))
+    {
+      DEBUG ("Failed to enable account: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  account_mgr = tp_account_manager_dup ();
+
+  empathy_connect_new_account (account, account_mgr);
+
+  g_object_unref (account_mgr);
+}
+
+static void
+apply_account_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source);
+  TpAccount *account;
+  GError *error = NULL;
+
+  if (!empathy_account_settings_apply_finish (settings, result, NULL, &error))
+    {
+      DEBUG ("Failed to create account: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  /* enable the newly created account */
+  account = empathy_account_settings_get_account (settings);
+  tp_account_set_enabled_async (account, TRUE, account_enabled_cb, NULL);
+}
+
+void
+empathy_local_xmpp_assistant_widget_create_account (
+    EmpathyLocalXmppAssistantWidget *self)
+{
+  empathy_account_settings_apply_async (self->priv->settings,
+      apply_account_cb, NULL);
+}
+
+gboolean
+empathy_local_xmpp_assistant_widget_should_create_account (
+    TpAccountManager *manager)
+{
+  gboolean salut_created = FALSE;
+  GList *accounts, *l;
+
+  accounts = tp_account_manager_get_valid_accounts (manager);
+
+  for (l = accounts; l != NULL;  l = g_list_next (l))
+    {
+      TpAccount *account = TP_ACCOUNT (l->data);
+
+      if (!tp_strdiff (tp_account_get_protocol (account), "local-xmpp"))
+        {
+          salut_created = TRUE;
+          break;
+        }
+    }
+
+  g_list_free (accounts);
+
+  return !salut_created;
+}
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
new file mode 100644
index 000000000..35343bd40
--- /dev/null
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
@@ -0,0 +1,63 @@
+/*
+ * empathy-local-xmpp-assistant-widget.h - Source for
+ * EmpathyLocalXmppAssistantWidget
+ *
+ * Copyright (C) 2012 - Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with This library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__
+#define __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__
+
+#include <gtk/gtk.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+
+G_BEGIN_DECLS
+
+#define EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET (empathy_local_xmpp_assistant_widget_get_type ())
+#define EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET, EmpathyLocalXmppAssistantWidget))
+#define EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET, EmpathyLocalXmppAssistantWidgetClass))
+#define EMPATHY_IS_LOCAL_XMPP_ASSISTANT_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET))
+#define EMPATHY_IS_LOCAL_XMPP_ASSISTANT_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET))
+#define EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_LOCAL_XMPP_ASSISTANT_WIDGET, EmpathyLocalXmppAssistantWidgetClass))
+
+typedef struct _EmpathyLocalXmppAssistantWidget EmpathyLocalXmppAssistantWidget;
+typedef struct _EmpathyLocalXmppAssistantWidgetClass EmpathyLocalXmppAssistantWidgetClass;
+typedef struct _EmpathyLocalXmppAssistantWidgetPrivate EmpathyLocalXmppAssistantWidgetPrivate;
+
+struct _EmpathyLocalXmppAssistantWidget {
+  GtkGrid parent;
+
+  EmpathyLocalXmppAssistantWidgetPrivate *priv;
+};
+
+struct _EmpathyLocalXmppAssistantWidgetClass {
+  GtkGridClass parent_class;
+};
+
+GType empathy_local_xmpp_assistant_widget_get_type (void) G_GNUC_CONST;
+
+GtkWidget * empathy_local_xmpp_assistant_widget_new (void);
+
+void empathy_local_xmpp_assistant_widget_create_account (
+    EmpathyLocalXmppAssistantWidget *self);
+
+gboolean empathy_local_xmpp_assistant_widget_should_create_account (
+    TpAccountManager *manager);
+
+G_END_DECLS
+
+#endif /* __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__ */
diff --git a/libempathy-gtk/empathy-persona-store.c b/libempathy-gtk/empathy-persona-store.c
deleted file mode 100644
index a48fa121e..000000000
--- a/libempathy-gtk/empathy-persona-store.c
+++ /dev/null
@@ -1,1215 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2007-2008, 2010 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Mikael Hallendal <micke@imendio.com>
- *          Martyn Russell <martyn@imendio.com>
- *          Xavier Claessens <xclaesse@gmail.com>
- *          Philip Withnall <philip.withnall@collabora.co.uk>
- *
- * Based off EmpathyContactListStore.
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/util.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-persona-store.h"
-#include "empathy-gtk-enum-types.h"
-#include "empathy-ui-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-
-/* Active users are those which have recently changed state
- * (e.g. online, offline or from normal to a busy state). */
-
-/* Time in seconds user is shown as active */
-#define ACTIVE_USER_SHOW_TIME 7
-
-/* Time in seconds after connecting which we wait before active users are
- * enabled */
-#define ACTIVE_USER_WAIT_TO_ENABLE_TIME 5
-
-static void add_persona (EmpathyPersonaStore *self,
-    FolksPersona *persona);
-static GtkTreePath * find_persona (EmpathyPersonaStore *self,
-    FolksPersona *persona);
-static void update_persona (EmpathyPersonaStore *self,
-    FolksPersona *persona);
-static void remove_persona (EmpathyPersonaStore *self,
-    FolksPersona *persona);
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyPersonaStore)
-
-typedef struct
-{
-  FolksIndividual *individual; /* owned */
-  GHashTable *personas; /* owned Persona -> owned GtkTreeRowReference */
-
-  gboolean show_avatars;
-  gboolean show_protocols;
-  gboolean show_active;
-  EmpathyPersonaStoreSort sort_criterion;
-
-  guint inhibit_active;
-  guint setup_idle_id;
-
-  GHashTable *status_icons; /* owned icon name -> owned GdkPixbuf */
-} EmpathyPersonaStorePriv;
-
-enum {
-  PROP_0,
-  PROP_INDIVIDUAL,
-  PROP_SHOW_AVATARS,
-  PROP_SHOW_PROTOCOLS,
-  PROP_SORT_CRITERION
-};
-
-G_DEFINE_TYPE (EmpathyPersonaStore, empathy_persona_store, GTK_TYPE_LIST_STORE);
-
-static gboolean
-inhibit_active_cb (EmpathyPersonaStore *store)
-{
-  EmpathyPersonaStorePriv *priv;
-
-  priv = GET_PRIV (store);
-
-  priv->show_active = TRUE;
-  priv->inhibit_active = 0;
-
-  return FALSE;
-}
-
-typedef struct {
-  EmpathyPersonaStore *store;
-  FolksPersona *persona;
-  gboolean remove;
-  guint timeout;
-} ShowActiveData;
-
-static void persona_active_free (ShowActiveData *data);
-
-static void
-persona_active_invalidated (ShowActiveData *data,
-    GObject *old_object)
-{
-  /* Remove the timeout and free the struct, since the persona or persona
-   * store has disappeared. */
-  g_source_remove (data->timeout);
-
-  if (old_object == (GObject *) data->store)
-    data->store = NULL;
-  else if (old_object == (GObject *) data->persona)
-    data->persona = NULL;
-  else
-    g_assert_not_reached ();
-
-  persona_active_free (data);
-}
-
-static ShowActiveData *
-persona_active_new (EmpathyPersonaStore *self,
-    FolksPersona *persona,
-    gboolean remove_)
-{
-  ShowActiveData *data;
-
-  DEBUG ("Contact:'%s' now active, and %s be removed",
-      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona)),
-      remove_ ? "WILL" : "WILL NOT");
-
-  data = g_slice_new0 (ShowActiveData);
-
-  /* We don't actually want to force either the PersonaStore or the
-   * Persona to stay alive, since the user could quit Empathy or disable
-   * the account before the persona_active timeout is fired. */
-  g_object_weak_ref (G_OBJECT (self),
-      (GWeakNotify) persona_active_invalidated, data);
-  g_object_weak_ref (G_OBJECT (persona),
-      (GWeakNotify) persona_active_invalidated, data);
-
-  data->store = self;
-  data->persona = persona;
-  data->remove = remove_;
-
-  return data;
-}
-
-static void
-persona_active_free (ShowActiveData *data)
-{
-  if (data->store != NULL)
-    {
-      g_object_weak_unref (G_OBJECT (data->store),
-          (GWeakNotify) persona_active_invalidated, data);
-    }
-
-  if (data->persona != NULL)
-    {
-      g_object_weak_unref (G_OBJECT (data->persona),
-          (GWeakNotify) persona_active_invalidated, data);
-    }
-
-  g_slice_free (ShowActiveData, data);
-}
-
-static void
-persona_set_active (EmpathyPersonaStore *self,
-    FolksPersona *persona,
-    gboolean active,
-    gboolean set_changed)
-{
-  GtkTreePath *path;
-  GtkTreeIter iter;
-
-  path = find_persona (self, persona);
-  if (path == NULL)
-    return;
-
-  gtk_tree_model_get_iter (GTK_TREE_MODEL (self), &iter, path);
-  gtk_list_store_set (GTK_LIST_STORE (self), &iter,
-      EMPATHY_PERSONA_STORE_COL_IS_ACTIVE, active,
-      -1);
-
-  DEBUG ("Set item %s", active ? "active" : "inactive");
-
-  if (set_changed)
-    gtk_tree_model_row_changed (GTK_TREE_MODEL (self), path, &iter);
-
-  gtk_tree_path_free (path);
-}
-
-static gboolean
-persona_active_cb (ShowActiveData *data)
-{
-  const gchar *alias =
-      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (data->persona));
-
-  if (data->remove)
-    {
-      DEBUG ("Contact:'%s' active timeout, removing item", alias);
-      remove_persona (data->store, data->persona);
-    }
-
-  DEBUG ("Contact:'%s' no longer active", alias);
-  persona_set_active (data->store, data->persona, FALSE, TRUE);
-
-  persona_active_free (data);
-
-  return FALSE;
-}
-
-static void
-persona_updated_cb (FolksPersona *persona,
-    GParamSpec *pspec,
-    EmpathyPersonaStore *self)
-{
-  DEBUG ("Contact:'%s' updated, checking roster is in sync...",
-      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona)));
-
-  update_persona (self, persona);
-}
-
-static void
-add_persona_and_connect (EmpathyPersonaStore *self,
-    FolksPersona *persona)
-{
-  /* We don't want any non-Telepathy personas */
-  if (!TPF_IS_PERSONA (persona))
-    return;
-
-  g_signal_connect (persona, "notify::presence",
-      (GCallback) persona_updated_cb, self);
-  g_signal_connect (persona, "notify::presence-message",
-      (GCallback) persona_updated_cb, self);
-  g_signal_connect (persona, "notify::alias",
-      (GCallback) persona_updated_cb, self);
-  g_signal_connect (persona, "notify::avatar",
-      (GCallback) persona_updated_cb, self);
-
-  add_persona (self, persona);
-}
-
-static void
-remove_persona_and_disconnect (EmpathyPersonaStore *self,
-    FolksPersona *persona)
-{
-  if (!TPF_IS_PERSONA (persona))
-    return;
-
-  g_signal_handlers_disconnect_by_func (persona,
-      (GCallback) persona_updated_cb, self);
-
-  remove_persona (self, persona);
-}
-
-static void
-add_persona (EmpathyPersonaStore *self,
-    FolksPersona *persona)
-{
-  EmpathyPersonaStorePriv *priv;
-  GtkTreeIter iter;
-  GtkTreePath *path;
-  FolksPersonaStore *store;
-  TpContact *tp_contact;
-  EmpathyContact *contact;
-  const gchar *alias;
-
-  if (!TPF_IS_PERSONA (persona))
-    return;
-
-  priv = GET_PRIV (self);
-
-  alias = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona));
-  if (EMP_STR_EMPTY (alias))
-    return;
-
-  tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
-  if (tp_contact == NULL)
-    return;
-
-  contact = empathy_contact_dup_from_tp_contact (tp_contact);
-  store = folks_persona_get_store (persona);
-
-  gtk_list_store_insert_with_values (GTK_LIST_STORE (self), &iter, 0,
-      EMPATHY_PERSONA_STORE_COL_NAME, alias,
-      EMPATHY_PERSONA_STORE_COL_ACCOUNT_NAME,
-          folks_persona_store_get_display_name (store),
-      EMPATHY_PERSONA_STORE_COL_DISPLAY_ID,
-          folks_persona_get_display_id (persona),
-      EMPATHY_PERSONA_STORE_COL_PERSONA, persona,
-      EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL,
-          empathy_contact_get_capabilities (contact) &
-              EMPATHY_CAPABILITIES_AUDIO,
-      EMPATHY_PERSONA_STORE_COL_CAN_VIDEO_CALL,
-          empathy_contact_get_capabilities (contact) &
-              EMPATHY_CAPABILITIES_VIDEO,
-      -1);
-
-  g_object_unref (contact);
-
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (self), &iter);
-  g_hash_table_replace (priv->personas, g_object_ref (persona),
-      gtk_tree_row_reference_new (GTK_TREE_MODEL (self), path));
-  gtk_tree_path_free (path);
-
-  update_persona (self, persona);
-}
-
-static void
-remove_persona (EmpathyPersonaStore *self,
-    FolksPersona *persona)
-{
-  EmpathyPersonaStorePriv *priv;
-  GtkTreePath *path;
-  GtkTreeIter iter;
-
-  if (!TPF_IS_PERSONA (persona))
-    return;
-
-  priv = GET_PRIV (self);
-
-  path = find_persona (self, persona);
-  if (path == NULL)
-    return;
-
-  g_hash_table_remove (priv->personas, persona);
-
-  gtk_tree_model_get_iter (GTK_TREE_MODEL (self), &iter, path);
-  gtk_list_store_remove (GTK_LIST_STORE (self), &iter);
-  gtk_tree_path_free (path);
-}
-
-static GdkPixbuf *
-get_persona_status_icon (EmpathyPersonaStore *self,
-    FolksPersona *persona)
-{
-  EmpathyPersonaStorePriv *priv = GET_PRIV (self);
-  TpContact *tp_contact;
-  EmpathyContact *contact;
-  const gchar *protocol_name = NULL;
-  gchar *icon_name = NULL;
-  GdkPixbuf *pixbuf_status = NULL;
-  const gchar *status_icon_name = NULL;
-
-  tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
-  if (tp_contact == NULL)
-    return NULL;
-
-  contact = empathy_contact_dup_from_tp_contact (tp_contact);
-
-  status_icon_name = empathy_icon_name_for_contact (contact);
-  if (status_icon_name == NULL)
-    {
-      g_object_unref (contact);
-      return NULL;
-    }
-
-  if (priv->show_protocols)
-    {
-      protocol_name = empathy_protocol_name_for_contact (contact);
-      icon_name = g_strdup_printf ("%s-%s", status_icon_name, protocol_name);
-    }
-  else
-    {
-      icon_name = g_strdup_printf ("%s", status_icon_name);
-    }
-
-  pixbuf_status = g_hash_table_lookup (priv->status_icons, icon_name);
-
-  if (pixbuf_status == NULL)
-    {
-      pixbuf_status = empathy_pixbuf_contact_status_icon_with_icon_name (
-          contact, status_icon_name, priv->show_protocols);
-
-      if (pixbuf_status != NULL)
-        {
-          g_hash_table_insert (priv->status_icons, g_strdup (icon_name),
-              pixbuf_status);
-        }
-    }
-
-  g_object_unref (contact);
-  g_free (icon_name);
-
-  return pixbuf_status;
-}
-
-static void
-update_persona (EmpathyPersonaStore *self,
-    FolksPersona *persona)
-{
-  EmpathyPersonaStorePriv *priv = GET_PRIV (self);
-  GtkTreePath *path;
-  gboolean do_set_active = FALSE;
-  gboolean do_set_refresh = FALSE;
-  const gchar *alias;
-
-  path = find_persona (self, persona);
-  alias = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona));
-
-  if (path == NULL)
-    {
-      DEBUG ("Contact:'%s' in list:NO, should be:YES", alias);
-
-      add_persona (self, persona);
-
-      if (priv->show_active)
-        {
-          do_set_active = TRUE;
-          DEBUG ("Set active (contact added)");
-        }
-    }
-  else
-    {
-      FolksPersonaStore *store;
-      TpContact *tp_contact;
-      EmpathyContact *contact;
-      GtkTreeIter iter;
-      GdkPixbuf *pixbuf_avatar = NULL;
-      GdkPixbuf *pixbuf_status;
-      gboolean now_online = FALSE;
-      gboolean was_online = TRUE;
-
-      DEBUG ("Contact:'%s' in list:YES, should be:YES", alias);
-
-      gtk_tree_model_get_iter (GTK_TREE_MODEL (self), &iter, path);
-      gtk_tree_path_free (path);
-
-      /* Get online state now. */
-      now_online = folks_presence_details_is_online (
-          FOLKS_PRESENCE_DETAILS (persona));
-
-      /* Get online state before. */
-      gtk_tree_model_get (GTK_TREE_MODEL (self), &iter,
-          EMPATHY_PERSONA_STORE_COL_IS_ONLINE, &was_online,
-          -1);
-
-      /* Is this really an update or an online/offline. */
-      if (priv->show_active)
-        {
-          if (was_online != now_online)
-            {
-              do_set_active = TRUE;
-              do_set_refresh = TRUE;
-
-              DEBUG ("Set active (contact updated %s)",
-                  was_online ? "online  -> offline" : "offline -> online");
-            }
-          else
-            {
-              /* Was TRUE for presence updates. */
-              /* do_set_active = FALSE;  */
-              do_set_refresh = TRUE;
-              DEBUG ("Set active (contact updated)");
-            }
-        }
-
-      /* We still need to use EmpathyContact for the capabilities stuff */
-      tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
-      if (tp_contact != NULL)
-        {
-          contact = empathy_contact_dup_from_tp_contact (tp_contact);
-          store = folks_persona_get_store (persona);
-
-          pixbuf_avatar = empathy_pixbuf_avatar_from_contact_scaled (contact,
-              32, 32);
-          pixbuf_status = get_persona_status_icon (self, persona);
-
-          gtk_list_store_set (GTK_LIST_STORE (self), &iter,
-              EMPATHY_PERSONA_STORE_COL_ICON_STATUS, pixbuf_status,
-              EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR, pixbuf_avatar,
-              EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR_VISIBLE,
-                  priv->show_avatars,
-              EMPATHY_PERSONA_STORE_COL_NAME, alias,
-              EMPATHY_PERSONA_STORE_COL_ACCOUNT_NAME,
-                  folks_persona_store_get_display_name (store),
-              EMPATHY_PERSONA_STORE_COL_DISPLAY_ID,
-                  folks_persona_get_display_id (persona),
-              EMPATHY_PERSONA_STORE_COL_PRESENCE_TYPE,
-                  folks_presence_details_get_presence_type (
-                      FOLKS_PRESENCE_DETAILS (persona)),
-              EMPATHY_PERSONA_STORE_COL_STATUS,
-                  folks_presence_details_get_presence_message (
-                      FOLKS_PRESENCE_DETAILS (persona)),
-              EMPATHY_PERSONA_STORE_COL_IS_ONLINE, now_online,
-              EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL,
-                  empathy_contact_get_capabilities (contact) &
-                    EMPATHY_CAPABILITIES_AUDIO,
-              EMPATHY_PERSONA_STORE_COL_CAN_VIDEO_CALL,
-                  empathy_contact_get_capabilities (contact) &
-                    EMPATHY_CAPABILITIES_VIDEO,
-              -1);
-
-          g_object_unref (contact);
-        }
-
-      if (pixbuf_avatar)
-        g_object_unref (pixbuf_avatar);
-    }
-
-  if (priv->show_active && do_set_active)
-    {
-      persona_set_active (self, persona, do_set_active, do_set_refresh);
-
-      if (do_set_active)
-        {
-          ShowActiveData *data;
-
-          data = persona_active_new (self, persona, FALSE);
-          data->timeout = g_timeout_add_seconds (ACTIVE_USER_SHOW_TIME,
-              (GSourceFunc) persona_active_cb,
-              data);
-        }
-    }
-
-  /* FIXME: when someone goes online then offline quickly, the
-   * first timeout sets the user to be inactive and the second
-   * timeout removes the user from the contact list, really we
-   * should remove the first timeout.
-   */
-}
-
-static void
-individual_personas_changed_cb (GObject *object,
-    GeeSet *added,
-    GeeSet *removed,
-    EmpathyPersonaStore *self)
-{
-  GeeIterator *iter;
-
-  /* One of the personas' row references might hold the last reference to the
-   * PersonaStore, so we need to keep a reference ourselves so we don't get
-   * finalised. */
-  g_object_ref (self);
-
-  /* Remove the old personas. */
-  iter = gee_iterable_iterator (GEE_ITERABLE (removed));
-  while (gee_iterator_next (iter))
-    {
-      FolksPersona *persona = gee_iterator_get (iter);
-      remove_persona_and_disconnect (self, persona);
-      g_clear_object (&persona);
-    }
-  g_clear_object (&iter);
-
-  /* Add each of the new personas to the tree model */
-  iter = gee_iterable_iterator (GEE_ITERABLE (added));
-  while (gee_iterator_next (iter))
-    {
-      FolksPersona *persona = gee_iterator_get (iter);
-      add_persona_and_connect (self, persona);
-      g_clear_object (&persona);
-    }
-  g_clear_object (&iter);
-
-  g_object_unref (self);
-}
-
-static gint
-sort_personas (FolksPersona *persona_a,
-    FolksPersona *persona_b)
-{
-  EmpathyContact *contact;
-  TpAccount *account_a, *account_b;
-  TpContact *tp_contact_a, *tp_contact_b;
-  gint ret_val;
-
-  g_return_val_if_fail (persona_a != NULL || persona_b != NULL, 0);
-
-  /* alias */
-  ret_val = g_utf8_collate (
-      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona_a)),
-      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (persona_b)));
-
-  if (ret_val != 0)
-    goto out;
-
-  /* identifier */
-  ret_val = g_utf8_collate (folks_persona_get_display_id (persona_a),
-          folks_persona_get_display_id (persona_b));
-
-  if (ret_val != 0)
-    goto out;
-
-  tp_contact_a = tpf_persona_get_contact (TPF_PERSONA (persona_a));
-  tp_contact_b = tpf_persona_get_contact (TPF_PERSONA (persona_b));
-
-  /* handle the case that one or more of these personas are from the cache */
-  if (tp_contact_a == NULL || tp_contact_b == NULL)
-    {
-      ret_val = (tp_contact_a != NULL ? 1 : -1);
-      goto out;
-    }
-
-  contact = empathy_contact_dup_from_tp_contact (tp_contact_a);
-  account_a = empathy_contact_get_account (contact);
-  g_object_unref (contact);
-
-  contact = empathy_contact_dup_from_tp_contact (tp_contact_b);
-  account_b = empathy_contact_get_account (contact);
-  g_object_unref (contact);
-
-  /* protocol */
-  ret_val = strcmp (tp_account_get_protocol (account_a),
-        tp_account_get_protocol (account_b));
-
-  if (ret_val != 0)
-    goto out;
-
-  /* account ID */
-  ret_val = strcmp (tp_proxy_get_object_path (account_a),
-        tp_proxy_get_object_path (account_b));
-
-out:
-  return ret_val;
-}
-
-static gint
-state_sort_func (GtkTreeModel *model,
-    GtkTreeIter *iter_a,
-    GtkTreeIter *iter_b,
-    gpointer user_data)
-{
-  gint ret_val;
-  gchar *name_a, *name_b;
-  FolksPersona *persona_a, *persona_b;
-
-  gtk_tree_model_get (model, iter_a,
-          EMPATHY_PERSONA_STORE_COL_NAME, &name_a,
-          EMPATHY_PERSONA_STORE_COL_PERSONA, &persona_a,
-          -1);
-  gtk_tree_model_get (model, iter_b,
-          EMPATHY_PERSONA_STORE_COL_NAME, &name_b,
-          EMPATHY_PERSONA_STORE_COL_PERSONA, &persona_b,
-          -1);
-
-  if (persona_a == NULL || persona_b == NULL) {
-    ret_val = 0;
-    goto free_and_out;
-  }
-
-  /* If we managed to get this far, we can start looking at
-   * the presences.
-   */
-  ret_val = -tp_connection_presence_type_cmp_availability (
-      folks_presence_details_get_presence_type (
-          FOLKS_PRESENCE_DETAILS (persona_a)),
-      folks_presence_details_get_presence_type (
-          FOLKS_PRESENCE_DETAILS (persona_b)));
-
-  if (ret_val == 0) {
-    /* Fallback: compare by name et al. */
-    ret_val = sort_personas (persona_a, persona_b);
-  }
-
-free_and_out:
-  g_free (name_a);
-  g_free (name_b);
-
-  tp_clear_object (&persona_a);
-  tp_clear_object (&persona_b);
-
-  return ret_val;
-}
-
-static gint
-name_sort_func (GtkTreeModel *model,
-    GtkTreeIter *iter_a,
-    GtkTreeIter *iter_b,
-    gpointer user_data)
-{
-  gchar *name_a, *name_b;
-  FolksPersona *persona_a, *persona_b;
-  gint ret_val;
-
-  gtk_tree_model_get (model, iter_a,
-          EMPATHY_PERSONA_STORE_COL_NAME, &name_a,
-          EMPATHY_PERSONA_STORE_COL_PERSONA, &persona_a,
-          -1);
-  gtk_tree_model_get (model, iter_b,
-          EMPATHY_PERSONA_STORE_COL_NAME, &name_b,
-          EMPATHY_PERSONA_STORE_COL_PERSONA, &persona_b,
-          -1);
-
-  if (persona_a == NULL || persona_b == NULL)
-    ret_val = 0;
-  else
-    ret_val = sort_personas (persona_a, persona_b);
-
-  tp_clear_object (&persona_a);
-  tp_clear_object (&persona_b);
-
-  return ret_val;
-}
-
-static GtkTreePath *
-find_persona (EmpathyPersonaStore *self,
-    FolksPersona *persona)
-{
-  EmpathyPersonaStorePriv *priv = GET_PRIV (self);
-  GtkTreeRowReference *row;
-
-  row = g_hash_table_lookup (priv->personas, persona);
-  if (row == NULL)
-    return NULL;
-
-  return gtk_tree_row_reference_get_path (row);
-}
-
-static gboolean
-update_list_mode_foreach (GtkTreeModel *model,
-    GtkTreePath *path,
-    GtkTreeIter *iter,
-    EmpathyPersonaStore *self)
-{
-  EmpathyPersonaStorePriv *priv;
-  FolksPersona *persona;
-  GdkPixbuf *pixbuf_status;
-
-  priv = GET_PRIV (self);
-
-  gtk_tree_model_get (model, iter,
-      EMPATHY_PERSONA_STORE_COL_PERSONA, &persona,
-      -1);
-
-  if (persona == NULL)
-    return FALSE;
-
-  /* get icon from hash_table */
-  pixbuf_status = get_persona_status_icon (self, persona);
-
-  gtk_list_store_set (GTK_LIST_STORE (self), iter,
-      EMPATHY_PERSONA_STORE_COL_ICON_STATUS, pixbuf_status,
-      EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR_VISIBLE, priv->show_avatars,
-      -1);
-
-  tp_clear_object (&persona);
-
-  return FALSE;
-}
-
-static void
-set_up (EmpathyPersonaStore *self)
-{
-  EmpathyPersonaStorePriv *priv;
-  GType types[] = {
-    GDK_TYPE_PIXBUF,      /* Status pixbuf */
-    GDK_TYPE_PIXBUF,      /* Avatar pixbuf */
-    G_TYPE_BOOLEAN,       /* Avatar pixbuf visible */
-    G_TYPE_STRING,        /* Name */
-    G_TYPE_STRING,        /* Account name */
-    G_TYPE_STRING,        /* Display ID */
-    G_TYPE_UINT,          /* Presence type */
-    G_TYPE_STRING,        /* Status string */
-    FOLKS_TYPE_PERSONA,   /* Persona */
-    G_TYPE_BOOLEAN,       /* Is active */
-    G_TYPE_BOOLEAN,       /* Is online */
-    G_TYPE_BOOLEAN,       /* Can make audio calls */
-    G_TYPE_BOOLEAN,       /* Can make video calls */
-  };
-
-  priv = GET_PRIV (self);
-
-  gtk_list_store_set_column_types (GTK_LIST_STORE (self),
-      EMPATHY_PERSONA_STORE_COL_COUNT, types);
-
-  /* Set up sorting */
-  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (self),
-      EMPATHY_PERSONA_STORE_COL_NAME, name_sort_func, self, NULL);
-  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (self),
-      EMPATHY_PERSONA_STORE_COL_STATUS, state_sort_func, self, NULL);
-
-  priv->sort_criterion = EMPATHY_PERSONA_STORE_SORT_NAME;
-  empathy_persona_store_set_sort_criterion (self, priv->sort_criterion);
-}
-
-static void
-empathy_persona_store_init (EmpathyPersonaStore *self)
-{
-  EmpathyPersonaStorePriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_PERSONA_STORE, EmpathyPersonaStorePriv);
-
-  self->priv = priv;
-
-  priv->show_avatars = TRUE;
-  priv->show_protocols = FALSE;
-  priv->inhibit_active = g_timeout_add_seconds (ACTIVE_USER_WAIT_TO_ENABLE_TIME,
-      (GSourceFunc) inhibit_active_cb, self);
-
-  priv->status_icons = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-      g_object_unref);
-  priv->personas = g_hash_table_new_full (g_direct_hash, g_direct_equal,
-      g_object_unref, (GDestroyNotify) gtk_tree_row_reference_free);
-
-  set_up (self);
-}
-
-static void
-get_property (GObject *object,
-    guint param_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyPersonaStorePriv *priv = GET_PRIV (object);
-
-  switch (param_id)
-    {
-      case PROP_INDIVIDUAL:
-        g_value_set_object (value, priv->individual);
-        break;
-      case PROP_SHOW_AVATARS:
-        g_value_set_boolean (value, priv->show_avatars);
-        break;
-      case PROP_SHOW_PROTOCOLS:
-        g_value_set_boolean (value, priv->show_protocols);
-        break;
-      case PROP_SORT_CRITERION:
-        g_value_set_enum (value, priv->sort_criterion);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-set_property (GObject *object,
-    guint param_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyPersonaStore *self = EMPATHY_PERSONA_STORE (object);
-
-  switch (param_id)
-    {
-      case PROP_INDIVIDUAL:
-        empathy_persona_store_set_individual (self, g_value_get_object (value));
-        break;
-      case PROP_SHOW_AVATARS:
-        empathy_persona_store_set_show_avatars (self,
-            g_value_get_boolean (value));
-        break;
-      case PROP_SHOW_PROTOCOLS:
-        empathy_persona_store_set_show_protocols (self,
-            g_value_get_boolean (value));
-        break;
-      case PROP_SORT_CRITERION:
-        empathy_persona_store_set_sort_criterion (self,
-            g_value_get_enum (value));
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-dispose (GObject *object)
-{
-  EmpathyPersonaStorePriv *priv = GET_PRIV (object);
-
-  empathy_persona_store_set_individual (EMPATHY_PERSONA_STORE (object), NULL);
-
-  if (priv->inhibit_active != 0)
-    {
-      g_source_remove (priv->inhibit_active);
-      priv->inhibit_active = 0;
-    }
-
-  if (priv->setup_idle_id != 0)
-    {
-      g_source_remove (priv->setup_idle_id);
-      priv->setup_idle_id = 0;
-    }
-
-  G_OBJECT_CLASS (empathy_persona_store_parent_class)->dispose (object);
-}
-
-static void
-finalize (GObject *object)
-{
-  EmpathyPersonaStorePriv *priv = GET_PRIV (object);
-
-  g_hash_table_unref (priv->status_icons);
-  g_hash_table_unref (priv->personas);
-
-  G_OBJECT_CLASS (empathy_persona_store_parent_class)->finalize (object);
-}
-
-static void
-empathy_persona_store_class_init (EmpathyPersonaStoreClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->get_property = get_property;
-  object_class->set_property = set_property;
-  object_class->dispose = dispose;
-  object_class->finalize = finalize;
-
-  /**
-   * EmpathyPersonaStore:individual:
-   *
-   * The #FolksIndividual whose personas should be listed by the store. This
-   * may be %NULL, which results in an empty store.
-   */
-  g_object_class_install_property (object_class, PROP_INDIVIDUAL,
-      g_param_spec_object ("individual",
-          "Individual",
-          "The FolksIndividual whose Personas should be listed by the store.",
-          FOLKS_TYPE_INDIVIDUAL,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  /**
-   * EmpathyPersonaStore:show-avatars:
-   *
-   * Whether the store should display avatars for personas. This is a property
-   * of the store rather than of #EmpathyPersonaView for efficiency reasons.
-   */
-  g_object_class_install_property (object_class, PROP_SHOW_AVATARS,
-      g_param_spec_boolean ("show-avatars",
-          "Show Avatars",
-          "Whether the store should display avatars for personas.",
-          TRUE,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  /**
-   * EmpathyPersonaStore:show-protocols:
-   *
-   * Whether the store should display protocol icons for personas. This is a
-   * property of the store rather than of #EmpathyPersonaView because it is
-   * closely tied in with #EmpathyPersonaStore:show-avatars.
-   */
-  g_object_class_install_property (object_class, PROP_SHOW_PROTOCOLS,
-      g_param_spec_boolean ("show-protocols",
-          "Show Protocols",
-          "Whether the store should display protocol icons for personas.",
-          FALSE,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  /**
-   * EmpathyPersonaStore:sort-criterion:
-   *
-   * The criterion used to sort the personas in the store.
-   */
-  g_object_class_install_property (object_class, PROP_SORT_CRITERION,
-      g_param_spec_enum ("sort-criterion",
-          "Sort criterion",
-          "The sort criterion to use for sorting the persona list",
-          EMPATHY_TYPE_PERSONA_STORE_SORT,
-          EMPATHY_PERSONA_STORE_SORT_NAME,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_type_class_add_private (object_class, sizeof (EmpathyPersonaStorePriv));
-}
-
-/**
- * empathy_persona_store_new:
- * @individual: the #FolksIndividual whose personas should be used in the store,
- * or %NULL
- *
- * Create a new #EmpathyPersonaStore with the personas from the given
- * @individual.
- *
- * Return value: a new #EmpathyPersonaStore
- */
-EmpathyPersonaStore *
-empathy_persona_store_new (FolksIndividual *individual)
-{
-  g_return_val_if_fail (individual == NULL || FOLKS_IS_INDIVIDUAL (individual),
-      NULL);
-
-  return g_object_new (EMPATHY_TYPE_PERSONA_STORE,
-      "individual", individual, NULL);
-}
-
-/**
- * empathy_persona_store_get_individual:
- * @self: an #EmpathyPersonaStore
- *
- * Get the value of #EmpathyPersonaStore:individual.
- *
- * Return value: the individual being displayed by the store, or %NULL
- */
-FolksIndividual *
-empathy_persona_store_get_individual (EmpathyPersonaStore *self)
-{
-  g_return_val_if_fail (EMPATHY_IS_PERSONA_STORE (self), NULL);
-
-  return GET_PRIV (self)->individual;
-}
-
-/**
- * empathy_persona_store_set_individual:
- * @self: an #EmpathyPersonaStore
- * @individual: the new individual to display in the store, or %NULL
- *
- * Set #EmpathyPersonaStore:individual to @individual, replacing the personas
- * which were in the store with the personas belonging to @individual, or with
- * nothing if @individual is %NULL.
- */
-void
-empathy_persona_store_set_individual (EmpathyPersonaStore *self,
-    FolksIndividual *individual)
-{
-  EmpathyPersonaStorePriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_PERSONA_STORE (self));
-  g_return_if_fail (individual == NULL || FOLKS_IS_INDIVIDUAL (individual));
-
-  priv = GET_PRIV (self);
-
-  /* Remove the old individual */
-  if (priv->individual != NULL)
-    {
-      GeeSet *personas;
-      GeeIterator *iter;
-
-      g_signal_handlers_disconnect_by_func (priv->individual,
-          (GCallback) individual_personas_changed_cb, self);
-
-      /* Disconnect from and remove all personas belonging to this individual */
-      personas = folks_individual_get_personas (priv->individual);
-      iter = gee_iterable_iterator (GEE_ITERABLE (personas));
-      while (gee_iterator_next (iter))
-        {
-          FolksPersona *persona = gee_iterator_get (iter);
-          remove_persona_and_disconnect (self, persona);
-          g_clear_object (&persona);
-        }
-      g_clear_object (&iter);
-
-      g_object_unref (priv->individual);
-    }
-
-  priv->individual = individual;
-
-  /* Add the new individual */
-  if (individual != NULL)
-    {
-      GeeSet *personas;
-      GeeIterator *iter;
-
-      g_object_ref (individual);
-
-      g_signal_connect (individual, "personas-changed",
-          (GCallback) individual_personas_changed_cb, self);
-
-      /* Add pre-existing Personas */
-
-      personas = folks_individual_get_personas (individual);
-      iter = gee_iterable_iterator (GEE_ITERABLE (personas));
-      while (gee_iterator_next (iter))
-        {
-          FolksPersona *persona = gee_iterator_get (iter);
-          add_persona_and_connect (self, persona);
-          g_clear_object (&persona);
-        }
-      g_clear_object (&iter);
-    }
-
-  g_object_notify (G_OBJECT (self), "individual");
-}
-
-/**
- * empathy_persona_store_get_show_avatars:
- * @self: an #EmpathyPersonaStore
- *
- * Get the value of #EmpathyPersonaStore:show-avatars.
- *
- * Return value: %TRUE if avatars are made available by the store, %FALSE
- * otherwise
- */
-gboolean
-empathy_persona_store_get_show_avatars (EmpathyPersonaStore *self)
-{
-  g_return_val_if_fail (EMPATHY_IS_PERSONA_STORE (self), TRUE);
-
-  return GET_PRIV (self)->show_avatars;
-}
-
-/**
- * empathy_persona_store_set_show_avatars:
- * @self: an #EmpathyPersonaStore
- * @show_avatars: %TRUE to make avatars available through the store, %FALSE
- * otherwise
- *
- * Set #EmpathyPersonaStore:show-avatars to @show_avatars.
- */
-void
-empathy_persona_store_set_show_avatars (EmpathyPersonaStore *self,
-    gboolean show_avatars)
-{
-  EmpathyPersonaStorePriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_PERSONA_STORE (self));
-
-  priv = GET_PRIV (self);
-  priv->show_avatars = show_avatars;
-
-  gtk_tree_model_foreach (GTK_TREE_MODEL (self),
-      (GtkTreeModelForeachFunc) update_list_mode_foreach, self);
-
-  g_object_notify (G_OBJECT (self), "show-avatars");
-}
-
-/**
- * empathy_persona_store_get_show_protocols:
- * @self: an #EmpathyPersonaStore
- *
- * Get the value of #EmpathyPersonaStore:show-protocols.
- *
- * Return value: %TRUE if protocol images are made available by the store,
- * %FALSE otherwise
- */
-gboolean
-empathy_persona_store_get_show_protocols (EmpathyPersonaStore *self)
-{
-  g_return_val_if_fail (EMPATHY_IS_PERSONA_STORE (self), TRUE);
-
-  return GET_PRIV (self)->show_protocols;
-}
-
-/**
- * empathy_persona_store_set_show_protocols:
- * @self: an #EmpathyPersonaStore
- * @show_protocols: %TRUE to make protocol images available through the store,
- * %FALSE otherwise
- *
- * Set #EmpathyPersonaStore:show-protocols to @show_protocols.
- */
-void
-empathy_persona_store_set_show_protocols (EmpathyPersonaStore *self,
-    gboolean show_protocols)
-{
-  EmpathyPersonaStorePriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_PERSONA_STORE (self));
-
-  priv = GET_PRIV (self);
-  priv->show_protocols = show_protocols;
-
-  gtk_tree_model_foreach (GTK_TREE_MODEL (self),
-      (GtkTreeModelForeachFunc) update_list_mode_foreach, self);
-
-  g_object_notify (G_OBJECT (self), "show-protocols");
-}
-
-/**
- * empathy_persona_store_get_sort_criterion:
- * @self: an #EmpathyPersonaStore
- *
- * Get the value of #EmpathyPersonaStore:sort-criterion.
- *
- * Return value: the criterion used to sort the personas in the store
- */
-EmpathyPersonaStoreSort
-empathy_persona_store_get_sort_criterion (EmpathyPersonaStore *self)
-{
-  g_return_val_if_fail (EMPATHY_IS_PERSONA_STORE (self), 0);
-
-  return GET_PRIV (self)->sort_criterion;
-}
-
-/**
- * empathy_persona_store_set_sort_criterion:
- * @self: an #EmpathyPersonaStore
- * @show_avatars: a criterion to be used to sort personas in the store
- *
- * Set #EmpathyPersonaStore:sort-criterion to @sort_criterion.
- */
-void
-empathy_persona_store_set_sort_criterion (EmpathyPersonaStore *self,
-    EmpathyPersonaStoreSort sort_criterion)
-{
-  EmpathyPersonaStorePriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_PERSONA_STORE (self));
-
-  priv = GET_PRIV (self);
-  priv->sort_criterion = sort_criterion;
-
-  switch (sort_criterion)
-    {
-      case EMPATHY_PERSONA_STORE_SORT_STATE:
-        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self),
-            EMPATHY_PERSONA_STORE_COL_STATUS, GTK_SORT_ASCENDING);
-        break;
-      case EMPATHY_PERSONA_STORE_SORT_NAME:
-        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self),
-            EMPATHY_PERSONA_STORE_COL_NAME, GTK_SORT_ASCENDING);
-        break;
-      default:
-        g_assert_not_reached ();
-        break;
-    }
-
-  g_object_notify (G_OBJECT (self), "sort-criterion");
-}
diff --git a/libempathy-gtk/empathy-persona-store.h b/libempathy-gtk/empathy-persona-store.h
deleted file mode 100644
index 892f8fa72..000000000
--- a/libempathy-gtk/empathy-persona-store.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2007-2008, 2010 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Mikael Hallendal <micke@imendio.com>
- *          Martyn Russell <martyn@imendio.com>
- *          Xavier Claessens <xclaesse@gmail.com>
- *          Philip Withnall <philip.withnall@collabora.co.uk>
- *
- * Based off EmpathyContactListStore.
- */
-
-#ifndef __EMPATHY_PERSONA_STORE_H__
-#define __EMPATHY_PERSONA_STORE_H__
-
-#include <gtk/gtk.h>
-
-#include <folks/folks.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_PERSONA_STORE (empathy_persona_store_get_type ())
-#define EMPATHY_PERSONA_STORE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
-    EMPATHY_TYPE_PERSONA_STORE, EmpathyPersonaStore))
-#define EMPATHY_PERSONA_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
-    EMPATHY_TYPE_PERSONA_STORE, EmpathyPersonaStoreClass))
-#define EMPATHY_IS_PERSONA_STORE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
-    EMPATHY_TYPE_PERSONA_STORE))
-#define EMPATHY_IS_PERSONA_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
-    EMPATHY_TYPE_PERSONA_STORE))
-#define EMPATHY_PERSONA_STORE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
-    EMPATHY_TYPE_PERSONA_STORE, EmpathyPersonaStoreClass))
-
-typedef enum
-{
-  EMPATHY_PERSONA_STORE_SORT_STATE,
-  EMPATHY_PERSONA_STORE_SORT_NAME
-} EmpathyPersonaStoreSort;
-
-typedef enum
-{
-  EMPATHY_PERSONA_STORE_COL_ICON_STATUS,
-  EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR,
-  EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR_VISIBLE,
-  EMPATHY_PERSONA_STORE_COL_NAME,
-  EMPATHY_PERSONA_STORE_COL_ACCOUNT_NAME,
-  EMPATHY_PERSONA_STORE_COL_DISPLAY_ID,
-  EMPATHY_PERSONA_STORE_COL_PRESENCE_TYPE,
-  EMPATHY_PERSONA_STORE_COL_STATUS,
-  EMPATHY_PERSONA_STORE_COL_PERSONA,
-  EMPATHY_PERSONA_STORE_COL_IS_ACTIVE,
-  EMPATHY_PERSONA_STORE_COL_IS_ONLINE,
-  EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL,
-  EMPATHY_PERSONA_STORE_COL_CAN_VIDEO_CALL,
-  EMPATHY_PERSONA_STORE_COL_COUNT,
-} EmpathyPersonaStoreCol;
-
-typedef struct
-{
-  GtkListStore parent;
-  gpointer priv;
-} EmpathyPersonaStore;
-
-typedef struct
-{
-  GtkListStoreClass parent_class;
-} EmpathyPersonaStoreClass;
-
-GType empathy_persona_store_get_type (void) G_GNUC_CONST;
-
-EmpathyPersonaStore *empathy_persona_store_new (FolksIndividual *individual);
-
-FolksIndividual *empathy_persona_store_get_individual (
-    EmpathyPersonaStore *self);
-void empathy_persona_store_set_individual (EmpathyPersonaStore *self,
-    FolksIndividual *individual);
-
-gboolean empathy_persona_store_get_show_avatars (EmpathyPersonaStore *self);
-void empathy_persona_store_set_show_avatars (EmpathyPersonaStore *self,
-    gboolean show_avatars);
-
-gboolean empathy_persona_store_get_show_protocols (EmpathyPersonaStore *self);
-void empathy_persona_store_set_show_protocols   (EmpathyPersonaStore *self,
-    gboolean show_protocols);
-
-EmpathyPersonaStoreSort empathy_persona_store_get_sort_criterion (
-    EmpathyPersonaStore *self);
-void empathy_persona_store_set_sort_criterion (EmpathyPersonaStore *self,
-    EmpathyPersonaStoreSort sort_criterion);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_PERSONA_STORE_H__ */
diff --git a/libempathy-gtk/empathy-persona-view.c b/libempathy-gtk/empathy-persona-view.c
deleted file mode 100644
index 7df94a630..000000000
--- a/libempathy-gtk/empathy-persona-view.c
+++ /dev/null
@@ -1,844 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2007-2008, 2010 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Mikael Hallendal <micke@imendio.com>
- *          Martyn Russell <martyn@imendio.com>
- *          Xavier Claessens <xclaesse@gmail.com>
- *          Philip Withnall <philip.withnall@collabora.co.uk>
- *
- * Based off EmpathyContactListView.
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/util.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-persona-view.h"
-#include "empathy-contact-widget.h"
-#include "empathy-images.h"
-#include "empathy-cell-renderer-text.h"
-#include "empathy-cell-renderer-activatable.h"
-#include "empathy-gtk-enum-types.h"
-#include "empathy-ui-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-
-/**
- * SECTION:empathy-persona-view
- * @title: EmpathyPersonaView
- * @short_description: A tree view which displays personas from an individual
- * @include: libempathy-gtk/empathy-persona-view.h
- *
- * #EmpathyPersonaView is a tree view widget which displays the personas from
- * a given #EmpathyPersonaStore.
- *
- * It supports hiding offline personas and highlighting active personas. Active
- * personas are those which have recently changed state (e.g. online, offline or
- * from normal to a busy state).
- */
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyPersonaView)
-
-typedef struct
-{
-  GtkTreeModelFilter *filter;
-  GtkWidget *tooltip_widget;
-  gboolean show_offline;
-  EmpathyPersonaViewFeatureFlags features;
-} EmpathyPersonaViewPriv;
-
-enum
-{
-  PROP_0,
-  PROP_MODEL,
-  PROP_SHOW_OFFLINE,
-  PROP_FEATURES,
-};
-
-typedef enum
-{
-  DND_DRAG_TYPE_UNKNOWN = -1,
-  DND_DRAG_TYPE_INDIVIDUAL_ID = 0,
-  DND_DRAG_TYPE_PERSONA_ID,
-  DND_DRAG_TYPE_STRING,
-} DndDragType;
-
-#define DRAG_TYPE(T,I) \
-  { (gchar *) T, 0, I }
-
-static const GtkTargetEntry drag_types_dest[] = {
-  DRAG_TYPE ("text/x-individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID),
-  DRAG_TYPE ("text/plain", DND_DRAG_TYPE_STRING),
-  DRAG_TYPE ("STRING", DND_DRAG_TYPE_STRING),
-};
-
-static const GtkTargetEntry drag_types_source[] = {
-  DRAG_TYPE ("text/x-persona-id", DND_DRAG_TYPE_PERSONA_ID),
-};
-
-#undef DRAG_TYPE
-
-static GdkAtom drag_atoms_dest[G_N_ELEMENTS (drag_types_dest)];
-
-enum
-{
-  DRAG_INDIVIDUAL_RECEIVED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-G_DEFINE_TYPE (EmpathyPersonaView, empathy_persona_view, GTK_TYPE_TREE_VIEW);
-
-static gboolean
-filter_visible_func (GtkTreeModel *model,
-    GtkTreeIter *iter,
-    EmpathyPersonaView *self)
-{
-  EmpathyPersonaViewPriv *priv = GET_PRIV (self);
-  gboolean is_online;
-
-  gtk_tree_model_get (model, iter,
-      EMPATHY_PERSONA_STORE_COL_IS_ONLINE, &is_online,
-      -1);
-
-  return (priv->show_offline || is_online);
-}
-
-static void
-set_model (EmpathyPersonaView *self,
-    GtkTreeModel *model)
-{
-  EmpathyPersonaViewPriv *priv = GET_PRIV (self);
-
-  tp_clear_object (&priv->filter);
-
-  priv->filter = GTK_TREE_MODEL_FILTER (gtk_tree_model_filter_new (model,
-      NULL));
-  gtk_tree_model_filter_set_visible_func (priv->filter,
-      (GtkTreeModelFilterVisibleFunc) filter_visible_func, self, NULL);
-
-  gtk_tree_view_set_model (GTK_TREE_VIEW (self), GTK_TREE_MODEL (priv->filter));
-}
-
-static void
-tooltip_destroy_cb (GtkWidget *widget,
-    EmpathyPersonaView *self)
-{
-  EmpathyPersonaViewPriv *priv = GET_PRIV (self);
-
-  if (priv->tooltip_widget)
-    {
-      DEBUG ("Tooltip destroyed");
-      g_object_unref (priv->tooltip_widget);
-      priv->tooltip_widget = NULL;
-    }
-}
-
-static gboolean
-query_tooltip_cb (EmpathyPersonaView *self,
-    gint x,
-    gint y,
-    gboolean keyboard_mode,
-    GtkTooltip *tooltip,
-    gpointer user_data)
-{
-  EmpathyPersonaViewPriv *priv = GET_PRIV (self);
-  FolksPersona *persona;
-  TpContact *tp_contact;
-  EmpathyContact *contact;
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  GtkTreePath *path;
-  static gint running = 0;
-  gboolean ret = FALSE;
-
-  /* Avoid an infinite loop. See GNOME bug #574377 */
-  if (running > 0)
-    return FALSE;
-  running++;
-
-  if (!gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (self), &x, &y,
-      keyboard_mode, &model, &path, &iter))
-    {
-      goto OUT;
-    }
-
-  gtk_tree_view_set_tooltip_row (GTK_TREE_VIEW (self), tooltip, path);
-  gtk_tree_path_free (path);
-
-  gtk_tree_model_get (model, &iter,
-      EMPATHY_PERSONA_STORE_COL_PERSONA, &persona,
-      -1);
-  if (persona == NULL)
-    goto OUT;
-
-  tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
-  if (tp_contact == NULL)
-    {
-      g_clear_object (&persona);
-      goto OUT;
-    }
-
-  contact = empathy_contact_dup_from_tp_contact (tp_contact);
-
-  if (priv->tooltip_widget == NULL)
-    {
-      priv->tooltip_widget = empathy_contact_widget_new (contact,
-          EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP |
-          EMPATHY_CONTACT_WIDGET_SHOW_LOCATION);
-      gtk_container_set_border_width (GTK_CONTAINER (priv->tooltip_widget), 8);
-      g_object_ref (priv->tooltip_widget);
-      g_signal_connect (priv->tooltip_widget, "destroy",
-          (GCallback) tooltip_destroy_cb, self);
-      gtk_widget_show (priv->tooltip_widget);
-    }
-  else
-    {
-      empathy_contact_widget_set_contact (priv->tooltip_widget, contact);
-    }
-
-  gtk_tooltip_set_custom (tooltip, priv->tooltip_widget);
-  ret = TRUE;
-
-  g_object_unref (contact);
-  g_object_unref (persona);
-
-OUT:
-  running--;
-
-  return ret;
-}
-
-static void
-cell_set_background (EmpathyPersonaView *self,
-    GtkCellRenderer *cell,
-    gboolean is_active)
-{
-  if (is_active)
-    {
-      GdkRGBA color;
-      GtkStyleContext *style;
-
-      style = gtk_widget_get_style_context (GTK_WIDGET (self));
-
-      gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED,
-          &color);
-
-      /* Here we take the current theme colour and add it to
-       * the colour for white and average the two. This
-       * gives a colour which is inline with the theme but
-       * slightly whiter.
-       */
-      empathy_make_color_whiter (&color);
-
-      g_object_set (cell, "cell-background-rgba", &color, NULL);
-    }
-  else
-    {
-      g_object_set (cell, "cell-background-rgba", NULL, NULL);
-    }
-}
-
-static void
-pixbuf_cell_data_func (GtkTreeViewColumn *tree_column,
-    GtkCellRenderer *cell,
-    GtkTreeModel *model,
-    GtkTreeIter *iter,
-    EmpathyPersonaView *self)
-{
-  GdkPixbuf *pixbuf;
-  gboolean is_active;
-
-  gtk_tree_model_get (model, iter,
-      EMPATHY_PERSONA_STORE_COL_IS_ACTIVE, &is_active,
-      EMPATHY_PERSONA_STORE_COL_ICON_STATUS, &pixbuf,
-      -1);
-
-  g_object_set (cell, "pixbuf", pixbuf, NULL);
-  tp_clear_object (&pixbuf);
-
-  cell_set_background (self, cell, is_active);
-}
-
-static void
-audio_call_cell_data_func (GtkTreeViewColumn *tree_column,
-    GtkCellRenderer *cell,
-    GtkTreeModel *model,
-    GtkTreeIter *iter,
-    EmpathyPersonaView *self)
-{
-  gboolean is_active;
-  gboolean can_audio, can_video;
-
-  gtk_tree_model_get (model, iter,
-      EMPATHY_PERSONA_STORE_COL_IS_ACTIVE, &is_active,
-      EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL, &can_audio,
-      EMPATHY_PERSONA_STORE_COL_CAN_VIDEO_CALL, &can_video,
-      -1);
-
-  g_object_set (cell,
-      "visible", (can_audio || can_video),
-      "icon-name", can_video? EMPATHY_IMAGE_VIDEO_CALL : EMPATHY_IMAGE_VOIP,
-      NULL);
-
-  cell_set_background (self, cell, is_active);
-}
-
-static void
-avatar_cell_data_func (GtkTreeViewColumn *tree_column,
-    GtkCellRenderer *cell,
-    GtkTreeModel *model,
-    GtkTreeIter *iter,
-    EmpathyPersonaView *self)
-{
-  GdkPixbuf *pixbuf;
-  gboolean show_avatar, is_active;
-
-  gtk_tree_model_get (model, iter,
-      EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR, &pixbuf,
-      EMPATHY_PERSONA_STORE_COL_PIXBUF_AVATAR_VISIBLE, &show_avatar,
-      EMPATHY_PERSONA_STORE_COL_IS_ACTIVE, &is_active,
-      -1);
-
-  g_object_set (cell,
-      "visible", show_avatar,
-      "pixbuf", pixbuf,
-      NULL);
-
-  tp_clear_object (&pixbuf);
-
-  cell_set_background (self, cell, is_active);
-}
-
-static void
-text_cell_data_func (GtkTreeViewColumn *tree_column,
-    GtkCellRenderer *cell,
-    GtkTreeModel *model,
-    GtkTreeIter *iter,
-    EmpathyPersonaView *self)
-{
-  gboolean is_active;
-
-  gtk_tree_model_get (model, iter,
-      EMPATHY_PERSONA_STORE_COL_IS_ACTIVE, &is_active,
-      -1);
-
-  cell_set_background (self, cell, is_active);
-}
-
-static gboolean
-individual_drag_received (EmpathyPersonaView *self,
-    GdkDragContext *context,
-    GtkSelectionData *selection)
-{
-  EmpathyIndividualManager *manager = NULL;
-  FolksIndividual *individual;
-  const gchar *individual_id;
-  gboolean success = FALSE;
-
-  individual_id = (const gchar *) gtk_selection_data_get_data (selection);
-  manager = empathy_individual_manager_dup_singleton ();
-  individual = empathy_individual_manager_lookup_member (manager,
-      individual_id);
-
-  if (individual == NULL)
-    {
-      DEBUG ("Failed to find drag event individual with ID '%s'",
-          individual_id);
-      g_object_unref (manager);
-      return FALSE;
-    }
-
-  /* Emit a signal notifying of the drag. */
-  g_signal_emit (self, signals[DRAG_INDIVIDUAL_RECEIVED], 0,
-      gdk_drag_context_get_selected_action (context), individual, &success);
-
-  g_object_unref (manager);
-
-  return success;
-}
-
-static void
-drag_data_received (GtkWidget *widget,
-    GdkDragContext *context,
-    gint x,
-    gint y,
-    GtkSelectionData *selection,
-    guint info,
-    guint time_)
-{
-  EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (widget);
-  gboolean success = TRUE;
-
-  if (info == DND_DRAG_TYPE_INDIVIDUAL_ID || info == DND_DRAG_TYPE_STRING)
-    success = individual_drag_received (self, context, selection);
-
-  gtk_drag_finish (context, success, FALSE, GDK_CURRENT_TIME);
-}
-
-static gboolean
-drag_motion (GtkWidget *widget,
-    GdkDragContext *context,
-    gint x,
-    gint y,
-    guint time_)
-{
-  EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (widget);
-  GdkAtom target;
-  guint i;
-  DndDragType drag_type = DND_DRAG_TYPE_UNKNOWN;
-
-  target = gtk_drag_dest_find_target (GTK_WIDGET (self), context, NULL);
-
-  /* Determine the DndDragType of the data */
-  for (i = 0; i < G_N_ELEMENTS (drag_atoms_dest); i++)
-    {
-      if (target == drag_atoms_dest[i])
-        {
-          drag_type = drag_types_dest[i].info;
-          break;
-        }
-    }
-
-  if (drag_type == DND_DRAG_TYPE_INDIVIDUAL_ID)
-    {
-      GtkTreePath *path;
-
-      /* FIXME: It doesn't make sense for us to highlight a specific row or
-       * position to drop an Individual in, so just highlight the entire
-       * widget.
-       * Since I can't find a way to do this, just highlight the first possible
-       * position in the tree. */
-      gdk_drag_status (context, gdk_drag_context_get_suggested_action (context),
-          time_);
-
-      path = gtk_tree_path_new_first ();
-      gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (self), path,
-          GTK_TREE_VIEW_DROP_BEFORE);
-      gtk_tree_path_free (path);
-
-      return TRUE;
-    }
-
-  /* Unknown or unhandled drag target */
-  gdk_drag_status (context, GDK_ACTION_DEFAULT, time_);
-  gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (self), NULL, 0);
-
-  return FALSE;
-}
-
-static void
-drag_data_get (GtkWidget *widget,
-    GdkDragContext *context,
-    GtkSelectionData *selection,
-    guint info,
-    guint time_)
-{
-  EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (widget);
-  FolksPersona *persona;
-  const gchar *persona_uid;
-
-  if (info != DND_DRAG_TYPE_PERSONA_ID)
-    return;
-
-  persona = empathy_persona_view_dup_selected (self);
-  if (persona == NULL)
-    return;
-
-  persona_uid = folks_persona_get_uid (persona);
-  gtk_selection_data_set (selection,
-      gdk_atom_intern ("text/x-persona-id", FALSE), 8,
-      (guchar *) persona_uid, strlen (persona_uid) + 1);
-
-  g_object_unref (persona);
-}
-
-static gboolean
-drag_drop (GtkWidget *widget,
-    GdkDragContext *drag_context,
-    gint x,
-    gint y,
-    guint time_)
-{
-  return FALSE;
-}
-
-static void
-set_features (EmpathyPersonaView *self,
-    EmpathyPersonaViewFeatureFlags features)
-{
-  EmpathyPersonaViewPriv *priv = GET_PRIV (self);
-
-  priv->features = features;
-
-  /* Setting reorderable is a hack that gets us row previews as drag icons
-     for free.  We override all the drag handlers.  It's tricky to get the
-     position of the drag icon right in drag_begin.  GtkTreeView has special
-     voodoo for it, so we let it do the voodoo that he do (but only if dragging
-     is enabled). */
-  gtk_tree_view_set_reorderable (GTK_TREE_VIEW (self),
-      (features & EMPATHY_PERSONA_VIEW_FEATURE_PERSONA_DRAG));
-
-  /* Update DnD source/dest */
-  if (features & EMPATHY_PERSONA_VIEW_FEATURE_PERSONA_DRAG)
-    {
-      gtk_drag_source_set (GTK_WIDGET (self),
-          GDK_BUTTON1_MASK,
-          drag_types_source,
-          G_N_ELEMENTS (drag_types_source),
-          GDK_ACTION_MOVE | GDK_ACTION_COPY);
-    }
-  else
-    {
-      gtk_drag_source_unset (GTK_WIDGET (self));
-    }
-
-  if (features & EMPATHY_PERSONA_VIEW_FEATURE_PERSONA_DROP)
-    {
-      gtk_drag_dest_set (GTK_WIDGET (self),
-          GTK_DEST_DEFAULT_ALL,
-          drag_types_dest,
-          G_N_ELEMENTS (drag_types_dest), GDK_ACTION_MOVE | GDK_ACTION_COPY);
-    }
-  else
-    {
-      gtk_drag_dest_unset (GTK_WIDGET (self));
-    }
-
-  g_object_notify (G_OBJECT (self), "features");
-}
-
-static void
-empathy_persona_view_init (EmpathyPersonaView *self)
-{
-  EmpathyPersonaViewPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-    EMPATHY_TYPE_PERSONA_VIEW, EmpathyPersonaViewPriv);
-
-  self->priv = priv;
-
-  /* Connect to tree view signals rather than override. */
-  g_signal_connect (self, "query-tooltip", (GCallback) query_tooltip_cb, NULL);
-}
-
-static void
-constructed (GObject *object)
-{
-  EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (object);
-  GtkCellRenderer *cell;
-  GtkTreeViewColumn *col;
-  guint i;
-
-  /* Set up view */
-  g_object_set (self,
-      "headers-visible", FALSE,
-      "show-expanders", FALSE,
-      NULL);
-
-  col = gtk_tree_view_column_new ();
-
-  /* State */
-  cell = gtk_cell_renderer_pixbuf_new ();
-  gtk_tree_view_column_pack_start (col, cell, FALSE);
-  gtk_tree_view_column_set_cell_data_func (col, cell,
-      (GtkTreeCellDataFunc) pixbuf_cell_data_func, self, NULL);
-
-  g_object_set (cell,
-      "xpad", 5,
-      "ypad", 1,
-      "visible", TRUE,
-      NULL);
-
-  /* Name */
-  cell = empathy_cell_renderer_text_new ();
-  gtk_tree_view_column_pack_start (col, cell, TRUE);
-  gtk_tree_view_column_set_cell_data_func (col, cell,
-      (GtkTreeCellDataFunc) text_cell_data_func, self, NULL);
-
-  /* We (ab)use the name and status properties here to display display ID and
-   * account name, respectively. Harmless. */
-  gtk_tree_view_column_add_attribute (col, cell,
-      "name", EMPATHY_PERSONA_STORE_COL_DISPLAY_ID);
-  gtk_tree_view_column_add_attribute (col, cell,
-      "text", EMPATHY_PERSONA_STORE_COL_DISPLAY_ID);
-  gtk_tree_view_column_add_attribute (col, cell,
-      "presence-type", EMPATHY_PERSONA_STORE_COL_PRESENCE_TYPE);
-  gtk_tree_view_column_add_attribute (col, cell,
-      "status", EMPATHY_PERSONA_STORE_COL_ACCOUNT_NAME);
-
-  /* Audio Call Icon */
-  cell = empathy_cell_renderer_activatable_new ();
-  gtk_tree_view_column_pack_start (col, cell, FALSE);
-  gtk_tree_view_column_set_cell_data_func (col, cell,
-      (GtkTreeCellDataFunc) audio_call_cell_data_func, self, NULL);
-
-  g_object_set (cell,
-      "visible", FALSE,
-      NULL);
-
-  /* Avatar */
-  cell = gtk_cell_renderer_pixbuf_new ();
-  gtk_tree_view_column_pack_start (col, cell, FALSE);
-  gtk_tree_view_column_set_cell_data_func (col, cell,
-      (GtkTreeCellDataFunc) avatar_cell_data_func, self, NULL);
-
-  g_object_set (cell,
-      "xpad", 0,
-      "ypad", 0,
-      "visible", FALSE,
-      "width", 32,
-      "height", 32,
-      NULL);
-
-  /* Actually add the column now we have added all cell renderers */
-  gtk_tree_view_append_column (GTK_TREE_VIEW (self), col);
-
-  /* Drag & Drop. */
-  for (i = 0; i < G_N_ELEMENTS (drag_types_dest); ++i)
-    drag_atoms_dest[i] = gdk_atom_intern (drag_types_dest[i].target, FALSE);
-}
-
-static void
-get_property (GObject *object,
-    guint param_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyPersonaViewPriv *priv = GET_PRIV (object);
-
-  switch (param_id)
-    {
-      case PROP_MODEL:
-        g_value_set_object (value, priv->filter);
-        break;
-      case PROP_SHOW_OFFLINE:
-        g_value_set_boolean (value, priv->show_offline);
-        break;
-      case PROP_FEATURES:
-        g_value_set_flags (value, priv->features);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-set_property (GObject *object,
-    guint param_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (object);
-
-  switch (param_id)
-    {
-      case PROP_MODEL:
-        set_model (self, g_value_get_object (value));
-        break;
-      case PROP_SHOW_OFFLINE:
-        empathy_persona_view_set_show_offline (self,
-            g_value_get_boolean (value));
-        break;
-      case PROP_FEATURES:
-        set_features (self, g_value_get_flags (value));
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-dispose (GObject *object)
-{
-  EmpathyPersonaView *self = EMPATHY_PERSONA_VIEW (object);
-  EmpathyPersonaViewPriv *priv = GET_PRIV (self);
-
-  tp_clear_object (&priv->filter);
-
-  if (priv->tooltip_widget)
-    gtk_widget_destroy (priv->tooltip_widget);
-  priv->tooltip_widget = NULL;
-
-  G_OBJECT_CLASS (empathy_persona_view_parent_class)->dispose (object);
-}
-
-static void
-empathy_persona_view_class_init (EmpathyPersonaViewClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->constructed = constructed;
-  object_class->dispose = dispose;
-  object_class->get_property = get_property;
-  object_class->set_property = set_property;
-
-  widget_class->drag_data_received = drag_data_received;
-  widget_class->drag_drop = drag_drop;
-  widget_class->drag_data_get = drag_data_get;
-  widget_class->drag_motion = drag_motion;
-
-  signals[DRAG_INDIVIDUAL_RECEIVED] =
-      g_signal_new ("drag-individual-received",
-      G_OBJECT_CLASS_TYPE (klass),
-      G_SIGNAL_RUN_LAST,
-      G_STRUCT_OFFSET (EmpathyPersonaViewClass, drag_individual_received),
-      NULL, NULL,
-      g_cclosure_marshal_generic,
-      G_TYPE_BOOLEAN, 2, G_TYPE_UINT, FOLKS_TYPE_INDIVIDUAL);
-
-  /* We override the "model" property so that we can wrap it in a
-   * GtkTreeModelFilter for showing/hiding offline personas. */
-  g_object_class_override_property (object_class, PROP_MODEL, "model");
-
-  /**
-   * EmpathyPersonaStore:show-offline:
-   *
-   * Whether to display offline personas.
-   */
-  g_object_class_install_property (object_class, PROP_SHOW_OFFLINE,
-      g_param_spec_boolean ("show-offline",
-          "Show Offline",
-          "Whether to display offline personas.",
-          FALSE,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  /**
-   * EmpathyPersonaStore:features:
-   *
-   * Features of the view, such as whether drag and drop is enabled.
-   */
-  g_object_class_install_property (object_class, PROP_FEATURES,
-      g_param_spec_flags ("features",
-          "Features",
-          "Flags for all enabled features.",
-          EMPATHY_TYPE_PERSONA_VIEW_FEATURE_FLAGS,
-          EMPATHY_PERSONA_VIEW_FEATURE_NONE,
-          G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_type_class_add_private (object_class, sizeof (EmpathyPersonaViewPriv));
-}
-
-/**
- * empathy_persona_view_new:
- * @store: an #EmpathyPersonaStore
- * @features: a set of flags specifying the view's functionality, or
- * %EMPATHY_PERSONA_VIEW_FEATURE_NONE
- *
- * Create a new #EmpathyPersonaView displaying the personas in
- * #EmpathyPersonaStore.
- *
- * Return value: a new #EmpathyPersonaView
- */
-EmpathyPersonaView *
-empathy_persona_view_new (EmpathyPersonaStore *store,
-    EmpathyPersonaViewFeatureFlags features)
-{
-  g_return_val_if_fail (EMPATHY_IS_PERSONA_STORE (store), NULL);
-
-  return g_object_new (EMPATHY_TYPE_PERSONA_VIEW,
-      "model", store,
-      "features", features,
-      NULL);
-}
-
-/**
- * empathy_persona_view_dup_selected:
- * @self: an #EmpathyPersonaView
- *
- * Return the #FolksPersona associated with the currently selected row. The
- * persona is referenced before being returned. If no row is selected, %NULL is
- * returned.
- *
- * Return value: the currently selected #FolksPersona, or %NULL; unref with
- * g_object_unref()
- */
-FolksPersona *
-empathy_persona_view_dup_selected (EmpathyPersonaView *self)
-{
-  GtkTreeSelection *selection;
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  FolksPersona *persona;
-
-  g_return_val_if_fail (EMPATHY_IS_PERSONA_VIEW (self), NULL);
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
-  if (!gtk_tree_selection_get_selected (selection, &model, &iter))
-    return NULL;
-
-  gtk_tree_model_get (model, &iter,
-      EMPATHY_PERSONA_STORE_COL_PERSONA, &persona,
-      -1);
-
-  return persona;
-}
-
-/**
- * empathy_persona_view_get_show_offline:
- * @self: an #EmpathyPersonaView
- *
- * Get the value of the #EmpathyPersonaView:show-offline property.
- *
- * Return value: %TRUE if offline personas are being shown, %FALSE otherwise
- */
-gboolean
-empathy_persona_view_get_show_offline (EmpathyPersonaView *self)
-{
-  g_return_val_if_fail (EMPATHY_IS_PERSONA_VIEW (self), FALSE);
-
-  return GET_PRIV (self)->show_offline;
-}
-
-/**
- * empathy_persona_view_set_show_offline:
- * @self: an #EmpathyPersonaView
- * @show_offline: %TRUE to show personas which are offline, %FALSE otherwise
- *
- * Set the #EmpathyPersonaView:show-offline property to @show_offline.
- */
-void
-empathy_persona_view_set_show_offline (EmpathyPersonaView *self,
-    gboolean show_offline)
-{
-  EmpathyPersonaViewPriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_PERSONA_VIEW (self));
-
-  priv = GET_PRIV (self);
-  priv->show_offline = show_offline;
-
-  gtk_tree_model_filter_refilter (priv->filter);
-
-  g_object_notify (G_OBJECT (self), "show-offline");
-}
diff --git a/libempathy-gtk/empathy-persona-view.h b/libempathy-gtk/empathy-persona-view.h
deleted file mode 100644
index 0a6317c6b..000000000
--- a/libempathy-gtk/empathy-persona-view.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2007-2008, 2010 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Mikael Hallendal <micke@imendio.com>
- *          Martyn Russell <martyn@imendio.com>
- *          Xavier Claessens <xclaesse@gmail.com>
- *          Philip Withnall <philip.withnall@collabora.co.uk>
- *
- * Based off EmpathyContactListView.
- */
-
-#ifndef __EMPATHY_PERSONA_VIEW_H__
-#define __EMPATHY_PERSONA_VIEW_H__
-
-#include <gtk/gtk.h>
-
-#include <folks/folks.h>
-
-#include "empathy-persona-store.h"
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  EMPATHY_PERSONA_VIEW_FEATURE_NONE = 0,
-  EMPATHY_PERSONA_VIEW_FEATURE_PERSONA_DRAG = 1 << 0,
-  EMPATHY_PERSONA_VIEW_FEATURE_PERSONA_DROP = 1 << 1,
-  EMPATHY_PERSONA_VIEW_FEATURE_ALL = (1 << 2) - 1,
-} EmpathyPersonaViewFeatureFlags;
-
-#define EMPATHY_TYPE_PERSONA_VIEW (empathy_persona_view_get_type ())
-#define EMPATHY_PERSONA_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
-    EMPATHY_TYPE_PERSONA_VIEW, EmpathyPersonaView))
-#define EMPATHY_PERSONA_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
-    EMPATHY_TYPE_PERSONA_VIEW, EmpathyPersonaViewClass))
-#define EMPATHY_IS_PERSONA_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
-    EMPATHY_TYPE_PERSONA_VIEW))
-#define EMPATHY_IS_PERSONA_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
-    EMPATHY_TYPE_PERSONA_VIEW))
-#define EMPATHY_PERSONA_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
-    EMPATHY_TYPE_PERSONA_VIEW, EmpathyPersonaViewClass))
-
-typedef struct
-{
-  GtkTreeView parent;
-  gpointer priv;
-} EmpathyPersonaView;
-
-typedef struct
-{
-  GtkTreeViewClass parent_class;
-
-  void (* drag_individual_received) (EmpathyPersonaView *self,
-      GdkDragAction action,
-      FolksIndividual *individual);
-} EmpathyPersonaViewClass;
-
-GType empathy_persona_view_get_type (void) G_GNUC_CONST;
-
-EmpathyPersonaView *empathy_persona_view_new (EmpathyPersonaStore *store,
-    EmpathyPersonaViewFeatureFlags features);
-
-FolksPersona *empathy_persona_view_dup_selected (EmpathyPersonaView *self);
-
-gboolean empathy_persona_view_get_show_offline (EmpathyPersonaView *self);
-void empathy_persona_view_set_show_offline (EmpathyPersonaView *self,
-    gboolean show_offline);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_PERSONA_VIEW_H__ */
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 7b0cd2169..98df46b79 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -132,13 +132,15 @@ typedef struct {
 	guint type;
 	EmpathyMessage *msg;
 	char *str;
+	gboolean should_highlight;
 } QueuedItem;
 
 static QueuedItem *
 queue_item (GQueue *queue,
 	    guint type,
 	    EmpathyMessage *msg,
-	    const char *str)
+	    const char *str,
+	    gboolean should_highlight)
 {
 	QueuedItem *item = g_slice_new0 (QueuedItem);
 
@@ -146,6 +148,7 @@ queue_item (GQueue *queue,
 	if (msg != NULL)
 		item->msg = g_object_ref (msg);
 	item->str = g_strdup (str);
+	item->should_highlight = should_highlight;
 
 	g_queue_push_tail (queue, item);
 
@@ -775,7 +778,8 @@ theme_adium_remove_all_focus_marks (EmpathyThemeAdium *theme)
 
 static void
 theme_adium_append_message (EmpathyChatView *view,
-			    EmpathyMessage  *msg)
+			    EmpathyMessage  *msg,
+			    gboolean         should_highlight)
 {
 	EmpathyThemeAdium     *theme = EMPATHY_THEME_ADIUM (view);
 	EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
@@ -797,7 +801,7 @@ theme_adium_append_message (EmpathyChatView *view,
 	gboolean               action;
 
 	if (priv->pages_loading != 0) {
-		queue_item (&priv->message_queue, QUEUED_MESSAGE, msg, NULL);
+		queue_item (&priv->message_queue, QUEUED_MESSAGE, msg, NULL, should_highlight);
 		return;
 	}
 
@@ -886,7 +890,7 @@ theme_adium_append_message (EmpathyChatView *view,
 	} else {
 		g_string_append (message_classes, " incoming");
 	}
-	if (empathy_message_should_highlight (msg)) {
+	if (should_highlight) {
 		g_string_append (message_classes, " mention");
 	}
 	if (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY) {
@@ -975,7 +979,7 @@ theme_adium_append_event (EmpathyChatView *view,
 	gchar *str_escaped;
 
 	if (priv->pages_loading != 0) {
-		queue_item (&priv->message_queue, QUEUED_EVENT, NULL, str);
+		queue_item (&priv->message_queue, QUEUED_EVENT, NULL, str, FALSE);
 		return;
 	}
 
@@ -1005,7 +1009,7 @@ theme_adium_edit_message (EmpathyChatView *view,
 	GError *error = NULL;
 
 	if (priv->pages_loading != 0) {
-		queue_item (&priv->message_queue, QUEUED_EDIT, message, NULL);
+		queue_item (&priv->message_queue, QUEUED_EDIT, message, NULL, FALSE);
 		return;
 	}
 
@@ -1345,7 +1349,8 @@ theme_adium_load_finished_cb (WebKitWebView  *view,
 		switch (item->type)
 		{
 			case QUEUED_MESSAGE:
-				theme_adium_append_message (chat_view, item->msg);
+				theme_adium_append_message (chat_view, item->msg,
+					item->should_highlight);
 				break;
 
 			case QUEUED_EDIT:
diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c
index b9fd08d84..cf0c65268 100644
--- a/libempathy-gtk/empathy-theme-boxes.c
+++ b/libempathy-gtk/empathy-theme-boxes.c
@@ -337,7 +337,8 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
 
 static void
 theme_boxes_append_message (EmpathyChatTextView *view,
-			    EmpathyMessage      *message)
+			    EmpathyMessage      *message,
+			    gboolean             should_highlight)
 {
 	EmpathyContact *sender;
 
diff --git a/libempathy-gtk/empathy-theme-irc.c b/libempathy-gtk/empathy-theme-irc.c
index 2ee81a23e..ed8e3b380 100644
--- a/libempathy-gtk/empathy-theme-irc.c
+++ b/libempathy-gtk/empathy-theme-irc.c
@@ -50,7 +50,8 @@ theme_irc_create_tags (EmpathyThemeIrc *theme)
 
 static void
 theme_irc_append_message (EmpathyChatTextView *view,
-			  EmpathyMessage      *message)
+			  EmpathyMessage      *message,
+			  gboolean             should_highlight)
 {
 	GtkTextBuffer *buffer;
 	const gchar   *name;
@@ -77,7 +78,7 @@ theme_irc_append_message (EmpathyChatTextView *view,
 	if (empathy_contact_is_user (contact)) {
 		nick_tag = EMPATHY_THEME_IRC_TAG_NICK_SELF;
 	} else {
-		if (empathy_message_should_highlight (message)) {
+		if (should_highlight) {
 			nick_tag = EMPATHY_THEME_IRC_TAG_NICK_HIGHLIGHT;
 		} else {
 			nick_tag = EMPATHY_THEME_IRC_TAG_NICK_OTHER;
diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index 991f52133..9fb2297a5 100644
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -278,12 +278,13 @@ empathy_tls_dialog_constructed (GObject *object)
 
   gtk_dialog_add_buttons (dialog,
       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-      _("Continue"), GTK_RESPONSE_YES,
+      _("C_ontinue"), GTK_RESPONSE_YES,
       NULL);
 
   text = reason_to_string (self);
 
   g_object_set (message_dialog,
+      "title", _("Untrusted connection"),
       "text", _("This connection is untrusted. Would you like to "
           "continue anyway?"),
       "secondary-text", text,
@@ -312,6 +313,8 @@ empathy_tls_dialog_constructed (GObject *object)
   gtk_container_add (GTK_CONTAINER (expander), details);
   gtk_widget_show (details);
 
+  gtk_window_set_keep_above (GTK_WINDOW (self), TRUE);
+
   tp_g_signal_connect_object (priv->certificate, "invalidated",
       G_CALLBACK (certificate_invalidated_cb), self, 0);
 }
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index ca02a18d3..cc288bfa8 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -51,6 +51,7 @@ libempathy_headers =				\
 	empathy-keyring.h 			\
 	empathy-location.h			\
 	empathy-message.h			\
+	empathy-pkg-kit.h		\
 	empathy-request-util.h			\
 	empathy-server-sasl-handler.h		\
 	empathy-server-tls-handler.h		\
@@ -91,6 +92,7 @@ libempathy_handwritten_source =				\
 	empathy-irc-server.c				\
 	empathy-keyring.c				\
 	empathy-message.c				\
+	empathy-pkg-kit.c		\
 	empathy-request-util.c				\
 	empathy-server-sasl-handler.c			\
 	empathy-server-tls-handler.c			\
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index cf269bdc8..4d9795686 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index ad55a9442..fd05141ac 100644
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -66,6 +66,7 @@ G_BEGIN_DECLS
 #define EMPATHY_PREFS_CHAT_AVATAR_IN_ICON          "avatar-in-icon"
 #define EMPATHY_PREFS_CHAT_WEBKIT_DEVELOPER_TOOLS  "enable-webkit-developer-tools"
 #define EMPATHY_PREFS_CHAT_ROOM_LAST_ACCOUNT       "room-last-account"
+#define EMPATHY_PREFS_CHAT_SEND_CHAT_STATES        "send-chat-states"
 
 #define EMPATHY_PREFS_UI_SCHEMA EMPATHY_PREFS_SCHEMA ".ui"
 #define EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS     "separate-chat-windows"
@@ -77,6 +78,7 @@ G_BEGIN_DECLS
 #define EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST      "compact-contact-list"
 #define EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS     "chat-window-paned-pos"
 #define EMPATHY_PREFS_UI_SHOW_OFFLINE              "show-offline"
+#define EMPATHY_PREFS_UI_SHOW_GROUPS               "show-groups"
 
 #define EMPATHY_PREFS_CONTACTS_SCHEMA EMPATHY_PREFS_SCHEMA ".contacts"
 #define EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM      "sort-criterium"
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index b391d3ca9..68b094ef1 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -50,6 +50,7 @@ typedef struct
 {
   FolksIndividualAggregator *aggregator;
   GHashTable *individuals; /* Individual.id -> Individual */
+  gboolean contacts_loaded;
 } EmpathyIndividualManagerPriv;
 
 enum
@@ -57,6 +58,7 @@ enum
   FAVOURITES_CHANGED,
   GROUPS_CHANGED,
   MEMBERS_CHANGED,
+  CONTACTS_LOADED,
   LAST_SIGNAL
 };
 
@@ -334,11 +336,42 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass)
           G_TYPE_NONE,
           4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_UINT);
 
+  signals[CONTACTS_LOADED] =
+      g_signal_new ("contacts-loaded",
+          G_TYPE_FROM_CLASS (klass),
+          G_SIGNAL_RUN_LAST,
+          0,
+          NULL, NULL,
+          g_cclosure_marshal_generic,
+          G_TYPE_NONE,
+          0);
+
   g_type_class_add_private (object_class,
       sizeof (EmpathyIndividualManagerPriv));
 }
 
 static void
+aggregator_is_quiescent_notify_cb (FolksIndividualAggregator *aggregator,
+    GParamSpec *spec,
+    EmpathyIndividualManager *self)
+{
+  EmpathyIndividualManagerPriv *priv = GET_PRIV (self);
+  gboolean is_quiescent;
+
+  if (priv->contacts_loaded)
+    return;
+
+  g_object_get (aggregator, "is-quiescent", &is_quiescent, NULL);
+
+  if (!is_quiescent)
+    return;
+
+  priv->contacts_loaded = TRUE;
+
+  g_signal_emit (self, signals[CONTACTS_LOADED], 0);
+}
+
+static void
 empathy_individual_manager_init (EmpathyIndividualManager *self)
 {
   EmpathyIndividualManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
@@ -351,6 +384,8 @@ empathy_individual_manager_init (EmpathyIndividualManager *self)
   priv->aggregator = folks_individual_aggregator_new ();
   g_signal_connect (priv->aggregator, "individuals-changed-detailed",
       G_CALLBACK (aggregator_individuals_changed_cb), self);
+  g_signal_connect (priv->aggregator, "notify::is-quiescent",
+      G_CALLBACK (aggregator_is_quiescent_notify_cb), self);
   folks_individual_aggregator_prepare (priv->aggregator, NULL, NULL);
 }
 
@@ -720,3 +755,63 @@ empathy_individual_manager_unlink_individual (EmpathyIndividualManager *self,
   folks_individual_aggregator_unlink_individual (priv->aggregator, individual,
       (GAsyncReadyCallback) unlink_individual_cb, NULL);
 }
+
+gboolean
+empathy_individual_manager_get_contacts_loaded (EmpathyIndividualManager *self)
+{
+  EmpathyIndividualManagerPriv *priv = GET_PRIV (self);
+
+  return priv->contacts_loaded;
+}
+
+static gboolean
+individual_has_contact (FolksIndividual *individual,
+    TpContact *contact)
+{
+  GeeSet *personas;
+  GeeIterator *iter;
+  gboolean found = FALSE;
+
+  personas = folks_individual_get_personas (individual);
+  iter = gee_iterable_iterator (GEE_ITERABLE (personas));
+
+  while (!found && gee_iterator_next (iter))
+    {
+      TpfPersona *persona = gee_iterator_get (iter);
+
+      if (TPF_IS_PERSONA (persona))
+        {
+          TpContact *c = tpf_persona_get_contact (persona);
+
+          if (c == contact)
+            found = TRUE;
+        }
+
+      g_clear_object (&persona);
+    }
+
+  g_clear_object (&iter);
+
+  return found;
+}
+
+/* Try finding a FolksIndividual containing @contact as one of his persona */
+FolksIndividual *
+empathy_individual_manager_lookup_by_contact (EmpathyIndividualManager *self,
+    TpContact *contact)
+{
+  EmpathyIndividualManagerPriv *priv = GET_PRIV (self);
+  GHashTableIter iter;
+  gpointer value;
+
+  g_hash_table_iter_init (&iter, priv->individuals);
+  while (g_hash_table_iter_next (&iter, NULL, &value))
+    {
+      FolksIndividual *individual = value;
+
+      if (individual_has_contact (individual, contact))
+        return individual;
+    }
+
+  return NULL;
+}
diff --git a/libempathy/empathy-individual-manager.h b/libempathy/empathy-individual-manager.h
index 0d5cc74d4..08a1faade 100644
--- a/libempathy/empathy-individual-manager.h
+++ b/libempathy/empathy-individual-manager.h
@@ -90,5 +90,12 @@ void empathy_individual_manager_set_blocked (EmpathyIndividualManager *self,
     gboolean blocked,
     gboolean abusive);
 
+gboolean empathy_individual_manager_get_contacts_loaded (
+    EmpathyIndividualManager *self);
+
+FolksIndividual * empathy_individual_manager_lookup_by_contact (
+    EmpathyIndividualManager *self,
+    TpContact *contact);
+
 G_END_DECLS
 #endif /* __EMPATHY_INDIVIDUAL_MANAGER_H__ */
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 995f49ab7..6111bcd8c 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -633,75 +633,6 @@ empathy_message_is_backlog (EmpathyMessage *message)
 	return priv->is_backlog;
 }
 
-#define IS_SEPARATOR(ch) (ch == ' ' || ch == ',' || ch == '.' || ch == ':')
-gboolean
-empathy_message_should_highlight (EmpathyMessage *message)
-{
-	EmpathyContact *contact;
-	const gchar   *msg, *to;
-	gchar         *cf_msg, *cf_to;
-	gchar         *ch;
-	gboolean       ret_val;
-	TpChannelTextMessageFlags flags;
-
-	g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE);
-
-	ret_val = FALSE;
-
-	msg = empathy_message_get_body (message);
-	if (!msg) {
-		return FALSE;
-	}
-
-	contact = empathy_message_get_receiver (message);
-	if (!contact || !empathy_contact_is_user (contact)) {
-		return FALSE;
-	}
-
-	to = empathy_contact_get_alias (contact);
-	if (!to) {
-		return FALSE;
-	}
-
-	flags = empathy_message_get_flags (message);
-	if (flags & TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK) {
-		/* FIXME: Ideally we shouldn't highlight scrollback messages only if they
-		 * have already been received by the user before (and so are in the logs) */
-		return FALSE;
-	}
-
-	cf_msg = g_utf8_casefold (msg, -1);
-	cf_to = g_utf8_casefold (to, -1);
-
-	ch = strstr (cf_msg, cf_to);
-	if (ch == NULL) {
-		goto finished;
-	}
-	if (ch != cf_msg) {
-		/* Not first in the message */
-		if (!IS_SEPARATOR (*(ch - 1))) {
-			goto finished;
-		}
-	}
-
-	ch = ch + strlen (cf_to);
-	if (ch >= cf_msg + strlen (cf_msg)) {
-		ret_val = TRUE;
-		goto finished;
-	}
-
-	if (IS_SEPARATOR (*ch)) {
-		ret_val = TRUE;
-		goto finished;
-	}
-
-finished:
-	g_free (cf_msg);
-	g_free (cf_to);
-
-	return ret_val;
-}
-
 TpChannelTextMessageType
 empathy_message_type_from_str (const gchar *type_str)
 {
diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h
index 0c27c09e9..81da7bf43 100644
--- a/libempathy/empathy-message.h
+++ b/libempathy/empathy-message.h
@@ -77,7 +77,6 @@ gint64                   empathy_message_get_original_timestamp (EmpathyMessage
 gboolean                 empathy_message_is_backlog        (EmpathyMessage           *message);
 gboolean                 empathy_message_is_incoming       (EmpathyMessage           *message);
 
-gboolean                 empathy_message_should_highlight  (EmpathyMessage           *message);
 TpChannelTextMessageType empathy_message_type_from_str     (const gchar              *type_str);
 const gchar *            empathy_message_type_to_str       (TpChannelTextMessageType  type);
 
diff --git a/libempathy/empathy-pkg-kit.c b/libempathy/empathy-pkg-kit.c
new file mode 100644
index 000000000..259cd7f7d
--- /dev/null
+++ b/libempathy/empathy-pkg-kit.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2012 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Authors: Guillaume Desmottes <guillaume.desmottes@collabora.com>
+ */
+
+#include "config.h"
+
+#include <libempathy/empathy-pkg-kit.h>
+
+typedef struct
+{
+  guint xid;
+  gchar **packages;
+  gchar *options;
+
+  GSimpleAsyncResult *result;
+  GCancellable *cancellable;
+} InstallCtx;
+
+static InstallCtx *
+install_ctx_new (guint xid,
+    const gchar **packages,
+    const gchar *options,
+    GSimpleAsyncResult *result,
+    GCancellable *cancellable)
+{
+  InstallCtx *ctx = g_slice_new (InstallCtx);
+
+  ctx->xid = xid;
+  ctx->packages = g_strdupv ((gchar **) packages);
+  ctx->options = g_strdup (options);
+  ctx->result = g_object_ref (result);
+  ctx->cancellable = cancellable != NULL ? g_object_ref (cancellable) : NULL;
+  return ctx;
+}
+
+static void
+install_ctx_free (InstallCtx *ctx)
+{
+  g_free (ctx->packages);
+  g_free (ctx->options);
+  g_object_unref (ctx->result);
+  g_slice_free (InstallCtx, ctx);
+}
+
+static void
+install_ctx_complete (InstallCtx *ctx)
+{
+  g_simple_async_result_complete (ctx->result);
+  install_ctx_free (ctx);
+}
+
+static void
+install_ctx_failed (InstallCtx *ctx,
+    GError *error)
+{
+  g_simple_async_result_take_error (ctx->result, error);
+  install_ctx_complete (ctx);
+}
+
+static void
+install_package_names_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  InstallCtx *ctx = user_data;
+  GError *error = NULL;
+  GVariant *res;
+
+  res = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), result, &error);
+  if (res == NULL)
+    {
+      install_ctx_failed (ctx, error);
+      return;
+    }
+
+  install_ctx_complete (ctx);
+
+  g_variant_unref (res);
+}
+
+static void
+pkg_kit_proxy_new_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  InstallCtx *ctx = user_data;
+  GError *error = NULL;
+  GDBusProxy *proxy;
+
+  proxy = g_dbus_proxy_new_for_bus_finish (result, &error);
+  if (proxy == NULL)
+    {
+      install_ctx_failed (ctx, error);
+      return;
+    }
+
+  g_dbus_proxy_call (proxy, "InstallPackageNames",
+      g_variant_new ("(u^a&ss)", ctx->xid, ctx->packages, ctx->options),
+      G_DBUS_CALL_FLAGS_NONE, -1, NULL, install_package_names_cb, ctx);
+
+  g_object_unref (proxy);
+}
+
+/* Ideally this should live in PackageKit (fdo #45741) */
+void
+empathy_pkg_kit_install_packages_async (
+    guint xid,
+    const gchar **packages,
+    const gchar *options,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  InstallCtx *ctx;
+  GSimpleAsyncResult *result;
+
+  result = g_simple_async_result_new (NULL, callback, user_data,
+      empathy_pkg_kit_install_packages_async);
+
+  ctx = install_ctx_new (xid, packages, options != NULL ? options : "",
+      result, cancellable);
+
+  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+      G_DBUS_PROXY_FLAGS_NONE, NULL,
+      "org.freedesktop.PackageKit",
+      "/org/freedesktop/PackageKit",
+      "org.freedesktop.PackageKit.Modify",
+      NULL, pkg_kit_proxy_new_cb, ctx);
+
+  g_object_unref (result);
+}
+
+gboolean
+empathy_pkg_kit_install_packages_finish (GAsyncResult *result,
+    GError **error)
+{
+  g_return_val_if_fail (g_simple_async_result_is_valid (result, NULL,
+        empathy_pkg_kit_install_packages_async), FALSE);
+
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result),
+        error))
+    return FALSE;
+
+  return TRUE;
+}
diff --git a/src/empathy-auto-salut-account-helper.h b/libempathy/empathy-pkg-kit.h
index f0409d01d..b824d768e 100644
--- a/src/empathy-auto-salut-account-helper.h
+++ b/libempathy/empathy-pkg-kit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 Collabora Ltd.
+ * Copyright (C) 2012 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -15,22 +15,24 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+ * Authors: Guillaume Desmottes <guillaume.desmottes@collabora.com>
  */
 
-/* Helper functions to automatically create a Salut account */
+#ifndef __EMPATHY_PKG_KIT__
+#define __EMPATHY_PKG_KIT__
 
-#ifndef __AUTO_SALUT_ACCOUNT_HELPER_H__
-#define __AUTO_SALUT_ACCOUNT_HELPER_H__
+#include <glib.h>
+#include <gio/gio.h>
 
-#include <telepathy-glib/account-manager.h>
+void empathy_pkg_kit_install_packages_async (
+    guint xid,
+    const gchar **packages,
+    const gchar *options,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data);
 
-#include <libempathy/empathy-connection-managers.h>
-#include <libempathy/empathy-account-settings.h>
-
-gboolean should_create_salut_account (TpAccountManager *manager);
-
-EmpathyAccountSettings * create_salut_account_settings (void);
+gboolean empathy_pkg_kit_install_packages_finish (GAsyncResult *result,
+    GError **error);
 
 #endif
diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index 67867f96d..22af1ec7b 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -32,7 +32,6 @@
 #include <telepathy-glib/util.h>
 
 #include "empathy-utils.h"
-#include "empathy-connectivity.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
@@ -47,7 +46,6 @@
 struct _EmpathyPresenceManagerPrivate
 {
   DBusGProxy *gs_proxy;
-  EmpathyConnectivity *connectivity;
 
   gboolean ready;
 
@@ -56,8 +54,6 @@ struct _EmpathyPresenceManagerPrivate
   gboolean auto_away;
 
   TpConnectionPresenceType away_saved_state;
-  TpConnectionPresenceType saved_state;
-  gchar *saved_status;
 
   gboolean is_idle;
   guint ext_away_timeout;
@@ -175,9 +171,8 @@ session_status_changed_cb (DBusGProxy *gs_proxy,
     is_idle ? "yes" : "no");
 
   if (!self->priv->auto_away ||
-      (self->priv->saved_state == TP_CONNECTION_PRESENCE_TYPE_UNSET &&
-       (self->priv->state <= TP_CONNECTION_PRESENCE_TYPE_OFFLINE ||
-        self->priv->state == TP_CONNECTION_PRESENCE_TYPE_HIDDEN)))
+      (self->priv->state <= TP_CONNECTION_PRESENCE_TYPE_OFFLINE ||
+        self->priv->state == TP_CONNECTION_PRESENCE_TYPE_HIDDEN))
     {
       /* We don't want to go auto away OR we explicitely asked to be
        * offline, nothing to do here */
@@ -192,13 +187,7 @@ session_status_changed_cb (DBusGProxy *gs_proxy,
 
       ext_away_start (self);
 
-      if (self->priv->saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET)
-        /* We are disconnected, when coming back from away
-         * we want to restore the presence before the
-         * disconnection. */
-        self->priv->away_saved_state = self->priv->saved_state;
-      else
-        self->priv->away_saved_state = self->priv->state;
+      self->priv->away_saved_state = self->priv->state;
 
     new_state = TP_CONNECTION_PRESENCE_TYPE_AWAY;
     if (self->priv->state == TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY)
@@ -241,37 +230,6 @@ session_status_changed_cb (DBusGProxy *gs_proxy,
 }
 
 static void
-state_change_cb (EmpathyConnectivity *connectivity,
-    gboolean new_online,
-    EmpathyPresenceManager *self)
-{
-  if (!new_online)
-    {
-      /* We are no longer connected */
-      DEBUG ("Disconnected: Save state %d (%s)",
-          self->priv->state, self->priv->status);
-      self->priv->saved_state = self->priv->state;
-      g_free (self->priv->saved_status);
-      self->priv->saved_status = g_strdup (self->priv->status);
-      empathy_presence_manager_set_state (self,
-          TP_CONNECTION_PRESENCE_TYPE_OFFLINE);
-    }
-  else if (new_online
-      && self->priv->saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET)
-    {
-      /* We are now connected */
-      DEBUG ("Reconnected: Restore state %d (%s)",
-          self->priv->saved_state, self->priv->saved_status);
-      empathy_presence_manager_set_presence (self,
-          self->priv->saved_state,
-          self->priv->saved_status);
-      self->priv->saved_state = TP_CONNECTION_PRESENCE_TYPE_UNSET;
-      g_free (self->priv->saved_status);
-      self->priv->saved_status = NULL;
-    }
-}
-
-static void
 presence_manager_dispose (GObject *object)
 {
   EmpathyPresenceManager *self = (EmpathyPresenceManager *) object;
@@ -279,7 +237,6 @@ presence_manager_dispose (GObject *object)
   tp_clear_object (&self->priv->gs_proxy);
   tp_clear_object (&self->priv->manager);
 
-  tp_clear_object (&self->priv->connectivity);
   tp_clear_pointer (&self->priv->connect_times, g_hash_table_unref);
 
   next_away_stop (EMPATHY_PRESENCE_MANAGER (object));
@@ -530,11 +487,6 @@ empathy_presence_manager_init (EmpathyPresenceManager *self)
 
   g_object_unref (dbus);
 
-  self->priv->connectivity = empathy_connectivity_dup_singleton ();
-
-  tp_g_signal_connect_object (self->priv->connectivity,
-      "state-change", G_CALLBACK (state_change_cb), self, 0);
-
   self->priv->connect_times = g_hash_table_new (g_direct_hash, g_direct_equal);
 }
 
@@ -609,22 +561,6 @@ empathy_presence_manager_set_presence (EmpathyPresenceManager *self,
   if (!tp_strdiff (status, default_status))
     status = NULL;
 
-  if (state != TP_CONNECTION_PRESENCE_TYPE_OFFLINE &&
-      !empathy_connectivity_is_online (self->priv->connectivity))
-    {
-      DEBUG ("Empathy is not online");
-
-      self->priv->saved_state = state;
-      if (tp_strdiff (self->priv->status, status))
-        {
-          g_free (self->priv->saved_status);
-          self->priv->saved_status = NULL;
-          if (!EMP_STR_EMPTY (status))
-            self->priv->saved_status = g_strdup (status);
-        }
-      return;
-    }
-
   empathy_presence_manager_do_set_presence (self, state, status);
 }
 
diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c
index 5144fa4d8..fb699f09c 100644
--- a/libempathy/empathy-time.c
+++ b/libempathy/empathy-time.c
@@ -1,7 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2003-2007 Imendio AB
- * Copyright (C) 2007-2010 Collabora Ltd.
+ * Copyright (C) 2007-2012 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -34,110 +33,116 @@
 gint64
 empathy_time_get_current (void)
 {
-	GDateTime *now;
-	gint64 result;
+  GDateTime *now;
+  gint64 result;
 
-	now = g_date_time_new_now_utc ();
-	result = g_date_time_to_unix (now);
-	g_date_time_unref (now);
+  now = g_date_time_new_now_utc ();
+  result = g_date_time_to_unix (now);
+  g_date_time_unref (now);
 
-	return result;
+  return result;
 }
 
-/* Converts the UTC timestamp to a string, also in UTC. Returns NULL on failure. */
+/* Converts the UTC timestamp to a string, also in UTC.
+ * Returns NULL on failure. */
 gchar *
-empathy_time_to_string_utc (gint64       t,
-			    const gchar *format)
+empathy_time_to_string_utc (gint64 t,
+    const gchar *format)
 {
-	GDateTime *d;
-	char *result;
+  GDateTime *d;
+  char *result;
 
-	g_return_val_if_fail (format != NULL, NULL);
+  g_return_val_if_fail (format != NULL, NULL);
 
-	d = g_date_time_new_from_unix_utc (t);
-	result = g_date_time_format (d, format);
-	g_date_time_unref (d);
+  d = g_date_time_new_from_unix_utc (t);
+  result = g_date_time_format (d, format);
+  g_date_time_unref (d);
 
-	return result;
+  return result;
 }
 
-/* Converts the UTC timestamp to a string, in local time. Returns NULL on failure. */
+/* Converts the UTC timestamp to a string, in local time.
+ * Returns NULL on failure. */
 gchar *
 empathy_time_to_string_local (gint64 t,
-			      const gchar *format)
+    const gchar *format)
 {
-	GDateTime *d, *local;
-	gchar *result;
+  GDateTime *d, *local;
+  gchar *result;
 
-	g_return_val_if_fail (format != NULL, NULL);
+  g_return_val_if_fail (format != NULL, NULL);
 
-	d = g_date_time_new_from_unix_utc (t);
-	local = g_date_time_to_local (d);
-	g_date_time_unref (d);
+  d = g_date_time_new_from_unix_utc (t);
+  local = g_date_time_to_local (d);
+  g_date_time_unref (d);
 
-	result = g_date_time_format (local, format);
-	g_date_time_unref (local);
+  result = g_date_time_format (local, format);
+  g_date_time_unref (local);
 
-	return result;
+  return result;
 }
 
 gchar *
 empathy_duration_to_string (guint seconds)
 {
-	if (seconds < 60) {
-		return g_strdup_printf (ngettext ("%d second ago",
-			"%d seconds ago", seconds), seconds);
-	}
-	else if (seconds < (60 * 60)) {
-		seconds /= 60;
-		return g_strdup_printf (ngettext ("%d minute ago",
-			"%d minutes ago", seconds), seconds);
-	}
-	else if (seconds < (60 * 60 * 24)) {
-		seconds /= 60 * 60;
-		return g_strdup_printf (ngettext ("%d hour ago",
-			"%d hours ago", seconds), seconds);
-	}
-	else if (seconds < (60 * 60 * 24 * 7)) {
-		seconds /= 60 * 60 * 24;
-		return g_strdup_printf (ngettext ("%d day ago",
-			"%d days ago", seconds), seconds);
-	}
-	else if (seconds < (60 * 60 * 24 * 30)) {
-		seconds /= 60 * 60 * 24 * 7;
-		return g_strdup_printf (ngettext ("%d week ago",
-			"%d weeks ago", seconds), seconds);
-	}
-	else {
-		seconds /= 60 * 60 * 24 * 30;
-		return g_strdup_printf (ngettext ("%d month ago",
-			"%d months ago", seconds), seconds);
-	}
+  if (seconds < 60)
+    {
+      return g_strdup_printf (ngettext ("%d second ago",
+        "%d seconds ago", seconds), seconds);
+    }
+  else if (seconds < (60 * 60))
+    {
+      seconds /= 60;
+      return g_strdup_printf (ngettext ("%d minute ago",
+        "%d minutes ago", seconds), seconds);
+    }
+  else if (seconds < (60 * 60 * 24))
+    {
+      seconds /= 60 * 60;
+      return g_strdup_printf (ngettext ("%d hour ago",
+        "%d hours ago", seconds), seconds);
+    }
+  else if (seconds < (60 * 60 * 24 * 7))
+    {
+      seconds /= 60 * 60 * 24;
+      return g_strdup_printf (ngettext ("%d day ago",
+        "%d days ago", seconds), seconds);
+    }
+  else if (seconds < (60 * 60 * 24 * 30))
+    {
+      seconds /= 60 * 60 * 24 * 7;
+      return g_strdup_printf (ngettext ("%d week ago",
+        "%d weeks ago", seconds), seconds);
+    }
+  else
+    {
+      seconds /= 60 * 60 * 24 * 30;
+      return g_strdup_printf (ngettext ("%d month ago",
+        "%d months ago", seconds), seconds);
+    }
 }
 
 gchar  *
 empathy_time_to_string_relative (gint64 t)
 {
-	GDateTime *now, *then;
-	gint   seconds;
-	GTimeSpan delta;
-	gchar *result;
+  GDateTime *now, *then;
+  gint   seconds;
+  GTimeSpan delta;
+  gchar *result;
 
-	now = g_date_time_new_now_utc ();
-	then = g_date_time_new_from_unix_utc (t);
+  now = g_date_time_new_now_utc ();
+  then = g_date_time_new_from_unix_utc (t);
 
-	delta = g_date_time_difference (now, then);
-	seconds = delta / G_TIME_SPAN_SECOND;
+  delta = g_date_time_difference (now, then);
+  seconds = delta / G_TIME_SPAN_SECOND;
 
-	if (seconds > 0) {
-		result = empathy_duration_to_string (seconds);
-	}
-	else {
-		result = g_strdup (_("in the future"));
-	}
+  if (seconds > 0)
+    result = empathy_duration_to_string (seconds);
+  else
+    result = g_strdup (_("in the future"));
 
-	g_date_time_unref (now);
-	g_date_time_unref (then);
+  g_date_time_unref (now);
+  g_date_time_unref (then);
 
-	return result;
+  return result;
 }
diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h
index 3a22adeee..59bd9269b 100644
--- a/libempathy/empathy-time.h
+++ b/libempathy/empathy-time.h
@@ -1,7 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2004 Imendio AB
- * Copyright (C) 2007-2010 Collabora Ltd.
+ * Copyright (C) 2007-2012 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,20 +29,17 @@
 
 G_BEGIN_DECLS
 
-/*
- * Translators: use your locale preferred time format.
- * The fields follow the strftime standard:
- * look at the manual if you need help (man strftime)
- */
-#define EMPATHY_TIME_FORMAT_DISPLAY_SHORT _("%H:%M")
-#define EMPATHY_DATE_FORMAT_DISPLAY_SHORT  _("%a %d %b %Y")
-#define EMPATHY_TIME_DATE_FORMAT_DISPLAY_SHORT _("%a %d %b %Y, %H:%M")
+/* FIXME: ideally we should only display the hour and minutes but
+ * there is no localized format for that (bgo #668323) */
+#define EMPATHY_TIME_FORMAT_DISPLAY_SHORT "%X"
+#define EMPATHY_DATE_FORMAT_DISPLAY_SHORT "%a %d %b %Y"
+#define EMPATHY_TIME_DATE_FORMAT_DISPLAY_SHORT "%a %d %b %Y, %X"
 
 gint64  empathy_time_get_current     (void);
-gchar  *empathy_time_to_string_utc   (gint64       t,
-				      const gchar *format);
-gchar  *empathy_time_to_string_local (gint64       t,
-				      const gchar *format);
+gchar  *empathy_time_to_string_utc   (gint64 t,
+    const gchar *format);
+gchar  *empathy_time_to_string_local (gint64 t,
+    const gchar *format);
 gchar  *empathy_time_to_string_relative (gint64 t);
 gchar *empathy_duration_to_string (guint seconds);
 
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 96eda77b8..4e26a769b 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -51,6 +51,7 @@ struct _EmpathyTpChatPrivate {
 	gboolean               supports_subject;
 	gboolean               can_set_subject;
 	gchar                 *subject;
+	gchar                 *subject_actor;
 
 	/* Room config (for now, we only track the title and don't support
 	 * setting it) */
@@ -69,6 +70,7 @@ static void tp_chat_iface_init         (EmpathyContactListIface *iface);
 enum {
 	PROP_0,
 	PROP_ACCOUNT,
+	PROP_SELF_CONTACT,
 	PROP_REMOTE_CONTACT,
 	PROP_N_MESSAGES_SENDING,
 	PROP_TITLE,
@@ -608,12 +610,26 @@ update_subject (EmpathyTpChat *self,
 
 	subject = tp_asv_get_string (properties, "Subject");
 	if (subject != NULL) {
+		const gchar *actor;
+
 		g_free (priv->subject);
 		priv->subject = g_strdup (subject);
+
+		/* If the actor is included with this update, use it;
+		 * otherwise, clear it to avoid showing stale information.
+		 * Why might it not be included? When you join an IRC channel,
+		 * you get a pair of messages: first, the current topic; next,
+		 * who set it, and when. Idle reports these in two separate
+		 * signals.
+		 */
+		actor = tp_asv_get_string (properties, "Actor");
+		g_free (priv->subject_actor);
+		priv->subject_actor = g_strdup (actor);
+
 		g_object_notify (G_OBJECT (self), "subject");
 	}
 
-	/* TODO: track Actor and Timestamp. */
+	/* TODO: track Timestamp. */
 }
 
 static void
@@ -732,6 +748,14 @@ empathy_tp_chat_get_subject (EmpathyTpChat *self)
 	return priv->subject;
 }
 
+const gchar *
+empathy_tp_chat_get_subject_actor (EmpathyTpChat *self)
+{
+	EmpathyTpChatPrivate *priv = self->priv;
+
+	return priv->subject_actor;
+}
+
 static void
 tp_chat_dispose (GObject *object)
 {
@@ -767,6 +791,7 @@ tp_chat_finalize (GObject *object)
 
 	g_free (self->priv->title);
 	g_free (self->priv->subject);
+	g_free (self->priv->subject_actor);
 
 	G_OBJECT_CLASS (empathy_tp_chat_parent_class)->finalize (object);
 }
@@ -948,6 +973,7 @@ tp_chat_got_renamed_contacts_cb (TpConnection            *connection,
 		/* We change our nick */
 		tp_clear_object (&self->priv->user);
 		self->priv->user = g_object_ref (new);
+		g_object_notify (chat, "self-contact");
 	}
 
 	check_almost_ready (self);
@@ -1068,6 +1094,7 @@ tp_chat_got_self_contact_cb (TpConnection            *connection,
 
 	self->priv->user = g_object_ref (contact);
 	empathy_contact_set_is_user (self->priv->user, TRUE);
+	g_object_notify (chat, "self-contact");
 	check_almost_ready (self);
 }
 
@@ -1083,6 +1110,9 @@ tp_chat_get_property (GObject    *object,
 	case PROP_ACCOUNT:
 		g_value_set_object (value, self->priv->account);
 		break;
+	case PROP_SELF_CONTACT:
+		g_value_set_object (value, self->priv->user);
+		break;
 	case PROP_REMOTE_CONTACT:
 		g_value_set_object (value, self->priv->remote_contact);
 		break;
@@ -1171,6 +1201,19 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 							      G_PARAM_CONSTRUCT_ONLY |
 							      G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * EmpathyTpChat:self-contact:
+	 *
+	 * Not to be confused with TpChannel:group-self-contact.
+	 */
+	g_object_class_install_property (object_class,
+					 PROP_SELF_CONTACT,
+					 g_param_spec_object ("self-contact",
+							      "The local contact",
+							      "The EmpathyContact for the local user on this channel",
+							      EMPATHY_TYPE_CONTACT,
+							      G_PARAM_READABLE));
+
 	g_object_class_install_property (object_class,
 					 PROP_REMOTE_CONTACT,
 					 g_param_spec_object ("remote-contact",
diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index cc1c16aaf..885479cb3 100644
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -81,6 +81,7 @@ const gchar *  empathy_tp_chat_get_title            (EmpathyTpChat *self);
 
 gboolean       empathy_tp_chat_supports_subject     (EmpathyTpChat *self);
 const gchar *  empathy_tp_chat_get_subject          (EmpathyTpChat *self);
+const gchar *  empathy_tp_chat_get_subject_actor    (EmpathyTpChat *self);
 gboolean       empathy_tp_chat_can_set_subject      (EmpathyTpChat *self);
 void           empathy_tp_chat_set_subject          (EmpathyTpChat *self,
 						     const gchar   *subject);
diff --git a/libempathy/empathy-tp-streamed-media.c b/libempathy/empathy-tp-streamed-media.c
index 388b3aa00..f245dcfd5 100644
--- a/libempathy/empathy-tp-streamed-media.c
+++ b/libempathy/empathy-tp-streamed-media.c
@@ -20,6 +20,8 @@
  *          Xavier Claessens <xclaesse@gmail.com>
  */
 
+#include "config.h"
+
 #include <string.h>
 
 #include <telepathy-glib/proxy-subclass.h>
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 4b5738b7a..2f4c9edde 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -40,6 +40,8 @@
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
 
+#include <dbus/dbus-protocol.h>
+
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/connection.h>
 #include <telepathy-glib/channel.h>
@@ -350,7 +352,7 @@ create_errors_to_message_hash (void)
   g_hash_table_insert (errors, TP_ERROR_STR_CONNECTION_LOST,
     _("Connection has been lost"));
   g_hash_table_insert (errors, TP_ERROR_STR_ALREADY_CONNECTED,
-    _("This resource is already connected to the server"));
+    _("This account is already connected to the server"));
   g_hash_table_insert (errors, TP_ERROR_STR_CONNECTION_REPLACED,
     _("Connection has been replaced by a new connection using the "
     "same resource"));
@@ -369,6 +371,8 @@ create_errors_to_message_hash (void)
     "cryptography library"));
   g_hash_table_insert (errors, TP_ERROR_STR_SOFTWARE_UPGRADE_REQUIRED,
     _("Your software is too old"));
+  g_hash_table_insert (errors, DBUS_ERROR_NO_REPLY,
+    _("Internal error"));
 
   return errors;
 }
@@ -1191,3 +1195,23 @@ empathy_create_individual_from_tp_contact (TpContact *contact)
 
   return individual;
 }
+
+/* Look for a FolksIndividual containing @contact as one of his persona
+ * and create one if needed */
+FolksIndividual *
+empathy_ensure_individual_from_tp_contact (TpContact *contact)
+{
+  EmpathyIndividualManager *mgr;
+  FolksIndividual *individual;
+
+  mgr = empathy_individual_manager_dup_singleton ();
+  individual = empathy_individual_manager_lookup_by_contact (mgr, contact);
+
+  if (individual != NULL)
+    g_object_ref (individual);
+  else
+    individual = empathy_create_individual_from_tp_contact (contact);
+
+  g_object_unref (mgr);
+  return individual;
+}
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index ac5fef820..5ce8cc8cb 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -124,6 +124,9 @@ gboolean empathy_sasl_channel_supports_mechanism (TpChannel *channel,
 FolksIndividual * empathy_create_individual_from_tp_contact (
     TpContact *contact);
 
+FolksIndividual * empathy_ensure_individual_from_tp_contact (
+    TpContact *contact);
+
 /* Copied from wocky/wocky-utils.h */
 
 #define empathy_implement_finish_void(source, tag) \
diff --git a/m4/.gitignore b/m4/.gitignore
index 4642a3450..17d186b84 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,6 +1,5 @@
 gtk-doc.m4
 intltool.m4
-gnome-doc-utils.m4
 libtool.m4
 ltoptions.m4
 ltsugar.m4
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7c6a95f7f..ca41d9fe1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,8 +2,8 @@
 # Please keep this file sorted alphabetically.
 
 data/empathy.desktop.in.in
-data/org.gnome.Empathy.gschema.xml.in
 data/empathy-accounts.desktop.in.in
+data/org.gnome.Empathy.gschema.xml.in
 
 libempathy/empathy-ft-handler.c
 libempathy/empathy-message.c
@@ -42,15 +42,12 @@ libempathy-gtk/empathy-contactinfo-utils.c
 libempathy-gtk/empathy-groups-widget.c
 libempathy-gtk/empathy-individual-dialogs.c
 libempathy-gtk/empathy-individual-edit-dialog.c
-libempathy-gtk/empathy-individual-information-dialog.c
-libempathy-gtk/empathy-individual-linker.c
 libempathy-gtk/empathy-individual-menu.c
 libempathy-gtk/empathy-individual-view.c
 libempathy-gtk/empathy-individual-widget.c
 [type: gettext/glade]libempathy-gtk/empathy-individual-widget.ui
 libempathy-gtk/empathy-irc-network-chooser-dialog.c
 libempathy-gtk/empathy-irc-network-dialog.c
-libempathy-gtk/empathy-linking-dialog.c
 libempathy-gtk/empathy-log-window.c
 [type: gettext/glade]libempathy-gtk/empathy-log-window.ui
 libempathy-gtk/empathy-new-message-dialog.c
@@ -77,11 +74,9 @@ nautilus-sendto-plugin/empathy-nautilus-sendto.c
 
 src/empathy.c
 src/empathy-about-dialog.c
-src/empathy-account-assistant.c
 src/empathy-accounts-dialog.c
 [type: gettext/glade]src/empathy-accounts-dialog.ui
 src/empathy-auth-client.c
-src/empathy-auto-salut-account-helper.c
 src/empathy-av.c
 src/empathy-streamed-media-window.c
 [type: gettext/glade]src/empathy-call-window.ui
@@ -121,3 +116,4 @@ src/empathy-call-window.c
 src/empathy-call.c
 libempathy-gtk/empathy-search-bar.c
 libempathy-gtk/empathy-new-account-dialog.c
+libempathy-gtk/empathy-local-xmpp-assistant-widget.c
diff --git a/po/ar.po b/po/ar.po
index 4bd821e13..58d20000b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,45 +6,56 @@
 # Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>, 2004.
 # Abou Manal <aboumanal@gmail.com>, 2008.
 # Djihed Afifi<djihed@gmail.com, 2008.
-# Anas Afif Emad <anas.e87@gmail.com, 2008.
+# Anas Afif Emad <anas.e87@gmail.com, 2008, 2012.
 # Khaled Hosny <khaledhosny@eglug.org>, 2006, 2009, 2010, 2011.
+# Abderrahim Kitouni <a.kitouni@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gossip.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-19 02:56+0200\n"
-"PO-Revision-Date: 2011-03-19 02:56+0300\n"
-"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
+"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-03 11:58+0000\n"
+"PO-Revision-Date: 2012-02-16 15:47+0100\n"
+"Last-Translator: Abderrahim Kitouni <a.kitouni@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "دردش عبر جوجل توك و �يسبوك و MSN وغيرها من خدمات الدردشة"
+msgstr "دردش عبر جوجل توك و�يسبوك وMSN وغيرها من خدمات الدردشة"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
-msgstr "إمبثي"
+msgstr "إمبَثي"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
-msgstr "المرسال إمبثي"
+msgstr "مرسال الإنترنت إمبَثي"
 
 #: ../data/empathy.desktop.in.in.h:4
 msgid "IM Client"
-msgstr "مرسال محادثة �ورية"
+msgstr "عميل محادثة �ورية"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
-msgstr "ا�تح نا�ذة واحدة لكل محادثة."
+msgstr "ا�تح نا�ذة من�صلة دائمًا للمحادثات الجديدة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Camera device"
+msgstr "جهاز الكاميرا"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Camera position"
+msgstr "موقع الكاميرا"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -52,328 +63,358 @@ msgstr ""
 "الم�حر� الذي يجب إضا�ته بعد الأسماء عند استعمال (Tab) لتكملة الأسماء �ي "
 "المحادثات الجماعية."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "سمة نا�ذة المحادثة"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid "Chat window theme variant"
+msgstr "شكل س�مة نا�ذة الدردشة"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "قائمة لغات التدقيق الإملائي (ا�صل ب�اصلة، مثال: en, fr, nl)"
+msgstr "قائمة لغات التدقيق الإملائي (ا�صل ب�اصلة، مثال: \"en, fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
-msgstr "لائحة مختصرة للمتراسلين"
+msgstr "لائحة مصغرة للمتراسلين"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
-msgstr "يجب استعمال مدراء الشبكة"
+msgstr "يجب استعمال مدراء الاتصال"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "معيار ترتيب لائحة المتراسلين"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"جهاز الكاميرا الا�تراضي الذي سيستخدم �ي مكالمات ال�يديو، مثال ‎/dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "المجلد المبدئي لاختيار الصورة الشخصية"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
-msgstr "عطل التنبيهات المنبثقة عندما أكون بعيدا"
+msgstr "عطل التنبيهات المنبثقة عندما أكون بعيدًا"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
-msgstr "عطل الأصوات عندما أكون بعيدا"
+msgstr "عطل الأصوات عندما أكون بعيدًا"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
-msgstr "اعرض الأحداث القادمة �ي منطقة الحالة"
+msgstr "اعرض الأحداث الواردة �ي منطقة الحالة"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr ""
-"اعرض الأحداث القادمة �ي منطقة الحالة. إذا لم يكن صحيحا �ستعرض مباشرة على "
+"اعرض الأحداث الواردة �ي منطقة الحالة. إذا لم يكن صحيحا �ستعرض مباشرة على "
 "المستخدم."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Echo cancellation support"
+msgstr "دعم إلغاء الصدى"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "يستطيع إمبثي نشر مكان المستخدم"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "يستطيع إمبثي استخدام GPS لتخمين مكان المستخدم"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "يستطيع إمبثي استخدام شبكة الهات� المحمول لتخمين مكان المستخدم"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "يستطيع إمبثي استخدام الشبكة لتخمين مكان المستخدم"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
-msgstr "مجلد التنزيل المبدئي لإمبثي"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has migrated butterfly logs"
-msgstr "رحّل إمبثي سجلات butterfly"
+msgstr "مجلد التنزيل الا�تراضي لإمبثي"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
-msgstr "على إمبثى تغيير الحالة إلى بعيد تلقائيا عند الخمول"
+msgstr "على إمبثي تغيير الحالة إلى بعيد تلقائيًا عند الخمول"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "الاتصال الآلي عند بدء البرنامج"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "على إمبثي تقليل دقة تحديد المكان"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "استخدام الصور الشخصيّة للمتراسل كأيقونة لنا�ذة المحادثة"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "�عّل أدوات وب‌ك�ت للمطورين"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "�عّل التنبيهات المنبثقة للرسائل الجديدة"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
-msgstr "�عّل التدقيق الإملائي"
+msgstr "مكّن التدقيق الإملائي"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "أخ�� النا�ذة الرئيسية"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
-msgstr "أخ�� النا�ذة الرئيسية"
+msgstr "أخ�� النا�ذة الرئيسية."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Last account selected in Join Room dialog"
+msgstr "آخر حساب تم تحديده �ي مربع حوار انضم لغر�ة"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Nick completed character"
 msgstr "م�حر� الكنية التام"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Open new chats in separate windows"
-msgstr "ا�تح المحادثات الجديدة �ي نوا�ذ مت�رقة"
+msgstr "ا�تح المحادثات الجديدة �ي نوا�ذ من�صلة"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Path of the Adium theme to use"
 msgstr "مسار سمة Adium لتستخدم"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "مسار سمة Adium التي ستستخدم إذا كانت سمة الدردشة المستخدمة Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "شغل صوت عند وصول الرسائل"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for new conversations"
 msgstr "شغل صوت للمحادثات الجديدة"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for outgoing messages"
 msgstr "شغل صوت عند إرسال الرسائل"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound when a contact logs in"
-msgstr "_شغل صوت عندما يسجل الدخول أحد جهات الإتصال"
+msgstr "شغل صوت عندما يسجل الدخول أحد جهات الاتصال"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs out"
 msgstr "شغل صوت عندما يقوم أحد المتراسلين بالخروج"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when we log in"
 msgstr "شغل صوت عندما ألج"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log out"
 msgstr "شغل صوت عندما أخرج"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "أظهر التنبيهات المنبثقة إذا لم يكن التركيز على المحادثة"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications when a contact logs in"
 msgstr "أظهر تنبيهات منبثقة عند ولوج المتراسل"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs out"
 msgstr "أظهر تنبيهات منبثقة عند خروج المتراسل"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+msgid "Position the camera preview should be during a call."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Show Balance in contact list"
+msgstr "أظهر الرصيد �ي قائمة المتراسلين"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show avatars"
 msgstr "أعرض الصور الشخصية"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show contact list in rooms"
 msgstr "أظهر قائمة المتراسلين �ي الغر�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show hint about closing the main window"
-msgstr "أظهر تلميحة إغلاق النا�ذة الرئيسية"
+msgstr "أظهر تلميح إغلاق النا�ذة الرئيسية"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show offline contacts"
 msgstr "أظهر المتراسلين غير المتَّصلين"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show protocols"
 msgstr "أظهر البروتوكولات"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Spell checking languages"
 msgstr "لغات التدقيق اللغوي"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "The default folder to save file transfers in."
 msgstr "المجلد المبدئي لح�ظ المل�ات المنقولة �يه."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The last directory that an avatar image was chosen from."
 msgstr "آخر مجلد اخت�يرت منه الصورة الشخصية."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The position for the chat window side pane"
 msgstr "موضع اللوحة الجانبية �ي نا�ذة الدردشة"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "الموضع المح�وظ (بالبكسل) للّوحة الجانبية �ي نا�ذة الدردشة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "الس�مة المستخدمة لعرض المحادثة �ي نوا�ذ الدردشة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "شكل السمة المستخدمة لعرض المحادثة �ي نوا�ذ الدردشة."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "استخدم التعابير المرسومة"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use notification sounds"
 msgstr "استخدم أصوات التبليغ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use theme for chat rooms"
 msgstr "استخدم سمة لغر� الدردشة"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "�يما إن كان إمبثي سيطلع المتراسلين على مكان المستخدم."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "�يما إذا كان إمبثي سيستخدم GPS لتخمين المكان."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "�يما إذا كان إمبثي سيستخدم شبكة الهات� المحمول لتخمين المكان."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "�يما إذا كان إمبثي سيستخدم الشبكة لتخمين المكان."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "�يما إذا كان إمبثي رحّل سجلات butterfly."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "�يما إذا كان على إمبثي الولوج آليا إلى حساباتك عند بدء التشغيل."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "�يما إذا كان على إمبثي الانتقال إلى حالة بعيد تلقائيا عند السكون."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "�يما إذا كان على إمبثي خ�ض دقة تحديد المكان للح�اظ على الخصوصية."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "�يما إذا كان على إمبثي استخدام أ�اتر المتراسل كأيقونة لنا�ذة المحادثة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "�يما إذاكانت أدوات و�ب‌ك�ت للمطور -مثل �احص الوب- ست�عّل أم لا."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "�يما إذا يستخدم مدراء الشبكة لقطع الاتصال أو استرجاعه."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "�يما إذا كان عليه التأكد من الكلمات المكتوبة باللغة التي حددتها."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "�يما إذا يحول الابتسامات إلى صور معبّرة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "لتمكين �لتر Pulseaudio لإلغاء الصدى."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "ما إذا سيشغل صوت عند ولوج متراسل إلى الشبكة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "ما إذا سيشغل صوت عند خروج متراسل من الشبكة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of events."
 msgstr "ما إذا سيشغل صوت للتنبيه عن الأحداث."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "ما إذا سيشغل صوت عند وصول الرسائل."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "ما إذا سيشغل صوت للمحادثات الجديدة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "ما إذا سيشغل صوت عند إرسال الرسائل."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound when logging into a network."
 msgstr "ما إذا سيشغل صوت عند الولوج إلى شبكة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ما إذا سيشغل صوت عند الخروج من شبكة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play sound notifications when away or busy."
 msgstr "ما إذا سيشغل صوت عندما أكون بعيدا أو مشغولا."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ما إذا سي�عرض تنبيه منبثق عندما يصبح المتراسل غير متصل."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ما إذا سي�عرض تنبيه منبثق عندما يصبح المتراسل على الخط."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -381,36 +422,40 @@ msgstr ""
 "ما إذا سي�عرض تنبيه منبثق عند استلام رسالة جديدة حتى إذا كانت الدردشة م�توحة "
 "بال�عل لكن ليست �ي البؤرة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ما إذا سي�عرض تنبيه منبثق عند استلام رسالة جديدة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+msgid "Whether to show account balances in the contact list."
+msgstr "لعرض رصيد الحساب �ي قائمة المتراسلين."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "إظهار صور شخصية للمتراسلين �ي لائحة المتراسلين ونوا�ذ المحادثة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "عرض المرسلين غير المتصلين �ي لائحة المتراسلين."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show popup notifications when away or busy."
 msgstr "ما إذا ستظهر التنبيهات عندما أكون بعيدا أو مشغولا."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "ما إذا ست�عرض بروتوكولات المتراسلين �ي القائمة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show the contact list in chat rooms."
 msgstr "عرض قائمة المتراسلين �ي غر� المحادثة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show the contact list in compact mode."
 msgstr "عرض قائمة المتراسلين �ي شكلها المختصر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -418,15 +463,20 @@ msgstr ""
 "عرض حوار الرسائل حول إغلاق النا�ذة الرئيسية التي بها علامة الإغلاق �ي شريط "
 "العناوين."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to use the theme for chat rooms."
 msgstr "استخدام سمة لغر� المحادثة."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#, fuzzy
+#| msgid ""
+#| "Which criterion to use when sorting the contact list. Default is to sort "
+#| "by the contact's name with the value \"name\". A value of \"state\" will "
+#| "sort the contact list by state."
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "المعيار المطلوب استخدامه ل�رز لائحة المتراسلين. الم�ترض  ال�رز حسب اسم "
 "المتراسل. يمكن أيضا استخدام معيار الحالة لل�رز حسب حالة المتراسلين."
@@ -437,215 +487,234 @@ msgstr "أدر حسابات التراسل والصوت عبر الشبكة"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2242
+#: ../src/empathy-accounts-dialog.c:2327
 msgid "Messaging and VoIP Accounts"
 msgstr "حسابات التراسل"
 
-#: ../libempathy/empathy-ft-handler.c:825
-msgid "File transfer completed, but the file was corrupted"
-msgstr "تم نقل المل� لكن المل� كان تال�ا"
-
-#: ../libempathy/empathy-ft-handler.c:1113
-msgid "File transfer not supported by remote contact"
-msgstr "لا يدعم المتراسل البعيد نقل المل�ات"
-
-#: ../libempathy/empathy-ft-handler.c:1169
-msgid "The selected file is not a regular file"
-msgstr "المل� المختار ليس مل�ا اعتياديا"
-
-#: ../libempathy/empathy-ft-handler.c:1178
-msgid "The selected file is empty"
-msgstr "المل� المختار �ارغ"
-
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "نوع المقبس غير مدعوم"
-
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
 msgstr "لم يحدد أي سبب"
 
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-ft-handler.c:739
 msgid "The change in state was requested"
 msgstr "ر�ض تغيير الحالة"
 
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-ft-handler.c:742
 msgid "You canceled the file transfer"
 msgstr "أنت ألغيت نقل المل�"
 
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-ft-handler.c:745
 msgid "The other participant canceled the file transfer"
 msgstr "الشخص الآخر قام بإلغاء نقل المل�"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-ft-handler.c:748
 msgid "Error while trying to transfer the file"
 msgstr "حدثت مشكلة أثناء محاولة نقل المل�"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-ft-handler.c:751
 msgid "The other participant is unable to transfer the file"
 msgstr "الشخص الآخر غير قادر على نقل المل�"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "سبب مجهول"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-ft-handler.c:917
+msgid "File transfer completed, but the file was corrupted"
+msgstr "تم نقل المل� لكن المل� كان تال�ا"
+
+#: ../libempathy/empathy-ft-handler.c:1203
+msgid "File transfer not supported by remote contact"
+msgstr "لا يدعم المتراسل البعيد نقل المل�ات"
+
+#: ../libempathy/empathy-ft-handler.c:1259
+msgid "The selected file is not a regular file"
+msgstr "المل� المختار ليس مل�ا اعتياديا"
+
+#: ../libempathy/empathy-ft-handler.c:1268
+msgid "The selected file is empty"
+msgstr "المل� المختار �ارغ"
+
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "مكالمة �ائتة م�ن %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "تم الاتصال بـ %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "مكالمة م�ن %s"
+
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "موجود"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "مشغول"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "غائب"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "خ�ي"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "غير متصل"
 
-#: ../libempathy/empathy-utils.c:315
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:245
+msgctxt "presence"
 msgid "Unknown"
 msgstr "مجهول"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "لم يحدد أي سبب"
 
-#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
-msgstr "الحالة محددة على غير متصل."
+msgstr "الحالة محددة على غير متصل"
 
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "خطأ شبكي"
 
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "�شل التحقق"
 
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "خطأ �ي التعمية"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
-msgstr "الاسم مستخدم مسبقا"
+msgstr "الاسم مستخدم مسبقًا"
 
-#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "الشهادة غير متو�رة"
 
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "الشهادة غير موثوق بها"
 
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
-msgstr "انتهت صلاحية الشهادة"
+msgstr "الشهادة منتهية الصلاحية"
 
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "الشهادة غير نشطة"
 
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "عدم تطابق الشهادة مع اسم الخادوم"
 
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "عدم تطابق الشهادة مع التوقيع"
 
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "شهادة موقعة ذاتيا"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "خطأ �ي الشهادة"
 
-#: ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "التعمية غير متاحة"
 
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "الشّهادة ليست صالحة"
 
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "ر���ض الاتصال"
 
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
-msgstr "تعذّر بناء الاتصال"
+msgstr "تعذّر تأسيس الاتصال"
 
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "��ق�د الاتصال"
 
-#: ../libempathy/empathy-utils.c:424
+#: ../libempathy/empathy-utils.c:355
 msgid "This resource is already connected to the server"
 msgstr "هذا المورد متصل مسبقا بالخادوم"
 
-#: ../libempathy/empathy-utils.c:426
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "استبدل الاتصال باتصال جديد باستخدام ن�س المور�د"
 
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
-msgstr "الحساب موجود مسبقا على الخادوم"
+msgstr "الحساب موجود مسبقًا على الخادوم"
 
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
-msgstr "الحاسوب مشغول حاليا ولا يستطيع التعامل مع الاتصال"
+msgstr "الخادوم مشغول حاليًا ولا يستطيع التعامل مع الاتصال"
 
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "ن�ق�ضت الشهادة"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "تستخدم الشهادة خوارزمية تعمية غير آمنة أو ضعي�ة"
 
-#: ../libempathy/empathy-utils.c:438
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
-"طول شهادة الخادوم أو عمق شبكة شهادة الخادوم تتجاوز الحد الذي ت�رضه مكتبة "
-"التعمية."
+"طول شهادة الخادوم أو طول سلسلة الشهادات الخادوم تتجاوز الحد الذي ت�رضه مكتبة "
+"التعمية"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "برنامجك قديم جدًا"
 
-#: ../libempathy/empathy-utils.c:601
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../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:606
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "ياهو! اليابان"
 
-#: ../libempathy/empathy-utils.c:635
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "جوجل توك"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "دردشة �يسبوك"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -656,7 +725,7 @@ msgstr[3] "منذ %d ثوان"
 msgstr[4] "منذ %d ثانية"
 msgstr[5] "منذ %d ثانية"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -667,7 +736,7 @@ msgstr[3] "منذ %d دقائق"
 msgstr[4] "منذ %d دقيقة"
 msgstr[5] "منذ %d دقيقة"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -678,7 +747,7 @@ msgstr[3] "منذ %d ساعات"
 msgstr[4] "منذ %d ساعة"
 msgstr[5] "منذ %d ساعة"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -689,7 +758,7 @@ msgstr[3] "منذ %d أيام"
 msgstr[4] "منذ %d يوما"
 msgstr[5] "منذ %d يوم"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -700,7 +769,7 @@ msgstr[3] "منذ %d أسابيع"
 msgstr[4] "منذ %d أسبوعا"
 msgstr[5] "منذ %d أسبوع"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -711,17 +780,16 @@ msgstr[3] "منذ %d أشهر"
 msgstr[4] "منذ %d شهرا"
 msgstr[5] "منذ %d شهر"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "�ي المستقبل"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "الكل"
+#: ../libempathy-gtk/empathy-account-chooser.c:692
+msgid "All accounts"
+msgstr "كل الحسابات"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
-#: ../src/empathy-import-widget.c:321
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "حساب"
 
@@ -739,84 +807,51 @@ msgstr "الخادوم"
 msgid "Port"
 msgstr "المن�ذ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:763
+#: ../libempathy-gtk/empathy-account-widget.c:815
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
-#, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "ي�حرر الحساب %s �ي \"حسابات الوب\"."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1172
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "لا يمكن تحرير الحساب %s �ي إمبثي."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "Launch My Web Accounts"
-msgstr "شغّل \"حسابات الوب\""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "اسم المستخدم:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1708
 msgid "A_pply"
 msgstr "_طبّق"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1737
 msgid "L_og in"
 msgstr "_ل�ج"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "الحساب:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2004
-msgid "_Enabled"
-msgstr "_م�عّل"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:1810
 msgid "This account already exists on the server"
 msgstr "هذا الحساب موجود مسبقا على الخادوم"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2072
+#: ../libempathy-gtk/empathy-account-widget.c:1814
 msgid "Create a new account on the server"
 msgstr "أنشئ حسابا جديدا على الخادوم"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2264
-msgid "Ca_ncel"
-msgstr "أ_لغ�"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2561
+#: ../libempathy-gtk/empathy-account-widget.c:2239
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "�%1$s على %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2587
+#: ../libempathy-gtk/empathy-account-widget.c:2265
 #, c-format
 msgid "%s Account"
 msgstr "حساب %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2591
+#: ../libempathy-gtk/empathy-account-widget.c:2269
 msgid "New account"
 msgstr "حساب جديد"
 
@@ -828,6 +863,7 @@ msgstr "<b>مثال:</b> MyScreenName"
 #: ../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
@@ -841,7 +877,7 @@ msgstr "متقدم"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "كلمة ال_سر:"
@@ -851,7 +887,7 @@ msgstr "كلمة ال_سر:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "تذكر كلمة السر"
 
@@ -861,9 +897,9 @@ msgstr "تذكر كلمة السر"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "تذكّر كلمة السر"
 
@@ -937,76 +973,84 @@ msgstr "ما معر�ك على ICQ؟"
 msgid "What is your ICQ password?"
 msgstr "ما كلمة سرك على ICQ؟"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "تلقائي"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "سجّل"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "الخيارات"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "لا شيء"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "الترمير:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"معظم خواديم IRC لا تحتاج كلمة مرور، لذا إذا لم تكن متأكدًا، لا ت�دخل كلمة "
+"مرور."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "الشبكة"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "الشبكة:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "الاسم المستعار:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "كلمة السر:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "رسالة الخروج:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "الاسم الحقيقي:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "الخواديم"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "ما كنية IRC التي تستخدمها؟"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "أي شبكة IRC؟"
 
@@ -1140,58 +1184,67 @@ msgid "Discover the STUN server automatically"
 msgstr "اكتش� خادوم STUN تلقائيا"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "تجاهل أخطاء TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "المدة (بالثواني)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "خيارات إبقاء الاتصال"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "توجيه متراخي"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "الآلية:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "خيارات متنوعة"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "خيارات انتقال NAT"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "المنْ�ذ:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "خيارات الوسيط"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "خادوم STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "الخادوم:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "النقل:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "استخدم هذا الحساب للاتصال بالهوات� الأر_ضية والهوات� الخليوية"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "ما كلمة سر حسابك على SIP؟"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "ما معر� ولوجك على SIP؟"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "اسم المست_خدم:"
 
@@ -1209,34 +1262,42 @@ msgstr "ما كلمة سرك على ياهو!؟"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
-msgstr "م�عرّ� _ياهو"
+msgstr "م�عرّ� _ياهو!:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "محلية لائحة ال_غر�:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "تعذّر تحويل الصورة"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "ولا واحدة من المصور المقبولة مدعومة �ي نظامك"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "تعذّر ح�ظ الصورة إلى مل�"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "اختر صورتك الشخصية"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "التقط صورة..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "لا صورة"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "صور"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "كل المل�ّات"
 
@@ -1244,43 +1305,73 @@ msgstr "كل المل�ّات"
 msgid "Click to enlarge"
 msgstr "انقر للتكبير"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:62
+msgid "There was an error starting the call"
+msgstr "حدث خطأ أثناء بدء المكالمة"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "المتراسل المحدد لا يدعم المكالمات"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "المتراسل المحدد غير متصل"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "المتراسل المحدد غير صالح"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "مكالمات الطوارئ غير مدعومة على هذا البروتوكول"
+
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "ليس لديك رصيدٌ كا�� لإجراء هذه المكالمة"
+
+#: ../libempathy-gtk/empathy-chat.c:710
 msgid "Failed to open private chat"
 msgstr "�شل �تح دردشة خصوصية"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:768
 msgid "Topic not supported on this conversation"
 msgstr "الموضوع غير مدعوم �ي هذه المحادثة"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:774
 msgid "You are not allowed to change the topic"
 msgstr "لا ي�سمح لك بتغيير الموضوع"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "“%s� هو معرّ� متراسل غير صالح"
+
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/clear: clear all messages from the current conversation"
 msgstr ""
 "/clear:\n"
 "يمسح كل الرسائل من المحادثة الحالية"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr ""
 "/topic <موضوع>:\n"
 "يحدد موضوع المحادثة الحالية"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 "/join <معرّ� غر�ة دردشة>:\n"
 "انضم إلى غر�ة دردشة جديدة"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 "/j <معرّ� غر�ة دردشة>:\n"
 "انضم إلى غر�ة دردشة جديدة"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1288,31 +1379,31 @@ msgstr ""
 "/part [<معرّ� غر�ة دردشة>] ‎[<سبب>]:\n"
 "غادر غر�ة الدردشة، الحالية إذا لم يحدد غيرها"
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 "/query <معرّ� متراسل>‎ [<رسالة>]:\n"
 "ا�تح دردشة خصوصية"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 "/msg <معرّ� متراسل>‎ <رسالة>:\n"
 "ا�تح دردشة خصوصية"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr ""
 "/nick <اسم مستعار>:\n"
 "غيّر اسمك المستعار على الخادوم الحالي"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <رسالة>:\n"
 "يرسل رسالة إجراء إلى المحادثة الحالية"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c: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 "
@@ -1322,7 +1413,11 @@ msgstr ""
 "يرسل <رسالة> إلى المحادثة الحالية. يستخدم هذا لإرسال رسالة تبدأ بشرطة مائلة "
 "'/'. مثلا: \"‪/say /join‬ تستخدم للانضمام إلى غر�ة دردشة جديدة\""
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1102
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <contact ID>: عرض معلومات حول متراسل"
+
+#: ../libempathy-gtk/empathy-chat.c:1105
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1330,98 +1425,127 @@ msgstr ""
 "/help [<أمر>]:\n"
 "اعرض كل الأوامر المدعومة. إذا كان <أمر> �سيعرض كي�ية استخدامه."
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1124
 #, c-format
 msgid "Usage: %s"
 msgstr "الاستخدام: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1169
 msgid "Unknown command"
 msgstr "أمرٌ مجهول"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1295
 msgid "Unknown command; see /help for the available commands"
 msgstr "أمرٌ مجهول؛ راجع ‪/help‬ لتعر� الأوامر المتاحة"
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#: ../libempathy-gtk/empathy-chat.c:1541
+msgid "insufficient balance to send message"
+msgstr "الرصيد غير كا�� لإرسال رسالة"
+
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1622
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "خطأ �ي ارسال الرسالة '%s': %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564
+#: ../libempathy-gtk/empathy-chat.c:1626
+#, c-format
+msgid "Error sending message: %s"
+msgstr "خطأ �ي إرسال الرسالة: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1553
+#, c-format, fuzzy
+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:1600
 msgid "offline"
 msgstr "غير متّصل"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "invalid contact"
 msgstr "متراسل غير صحيح"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "permission denied"
 msgstr "ر��ض التّصريح"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "too long message"
 msgstr "الرسالة طويلة جدا"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "not implemented"
 msgstr "غير مطبق"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "unknown"
 msgstr "مجهول"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "خطأ �ي ارسال الرسالة '%s': %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "الموضوع:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
 msgid "Topic set to: %s"
 msgstr "الموضوع: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../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:1848
+#: ../libempathy-gtk/empathy-chat.c:2221
 msgid "(No Suggestions)"
 msgstr "(لا اقتراحات)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../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:1953
+#: ../libempathy-gtk/empathy-chat.c:2326
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "أض�� '%s' إلى قاموس %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2396
 msgid "Insert Smiley"
 msgstr "أدرج التعابير المرسومة"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2414
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "أ_رسل"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2471
 msgid "_Spelling Suggestions"
 msgstr "ا_قتراحات الإملاء"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2560
 msgid "Failed to retrieve recent logs"
 msgstr "�شل جلب السجلات الحديثة"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2699
 #, c-format
 msgid "%s has disconnected"
 msgstr "�%s قطع الاتصال"
@@ -1429,12 +1553,12 @@ msgstr "�%s قطع الاتصال"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2706
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "�طرد %1$s�  %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2709
 #, c-format
 msgid "%s was kicked"
 msgstr "�%s ط�ر�د"
@@ -1442,17 +1566,17 @@ msgstr "�%s ط�ر�د"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2717
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "حظر  %1$s�  %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2720
 #, c-format
 msgid "%s was banned"
 msgstr "�%s ح�ظ�ر"
 
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2724
 #, c-format
 msgid "%s has left the room"
 msgstr "�%s غادر الغر�ة"
@@ -1462,141 +1586,164 @@ msgstr "�%s غادر الغر�ة"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid " (%s)"
 msgstr "�� (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2758
 #, c-format
 msgid "%s has joined the room"
 msgstr "انضم %s إلى الغر�ة"
 
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2783
 #, c-format
 msgid "%s is now known as %s"
 msgstr "يعر� %s الآن باسم %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1122
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c: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:3116
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "Would you like to store this password?"
 msgstr "أترغب �ي ح�ظ كلمة السر هذه؟"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3640
 msgid "Remember"
 msgstr "تذكّر"
 
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3650
 msgid "Not now"
 msgstr "ليس الآن"
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3694
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "أعد المحاولة"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3698
 msgid "Wrong password; please try again:"
 msgstr "كلمة سر خطأ؛ من �ضلك أعد المحاولة:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3828
 msgid "This room is protected by a password:"
 msgstr "هذه الغر�ة محمية بكلمة سر:"
 
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3855
 msgid "Join"
 msgstr "انضم"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "متَصل"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:4102
 msgid "Conversation"
 msgstr "محادثة"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:4107
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "معرّ� غير معرو� أو غير سليم"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "منع المتراسلين غير متاح مؤقتا"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "منع المتراسلين غير متاح"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "ر���ض الإذن"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "تعذّر منع المتراس�ل"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "حرّر المتراسلين الممنوعين"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "الحساب:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+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-theme-adium.c:794
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "ا_نسخ عنوان الوصلة"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "ا_�تح الوصلة"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "عدّل معلومات المتراسل"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "المعلومات الشخصية"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "متراسل جديد"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:532
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "أأمنع %s؟"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:537
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "أمتأكد أنك تريد منع '%s' من مراسلتك مرة أخرى؟"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:542
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "ا_منع"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:552
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "أ_بلع عن أن هذا المتراسل مؤذ�"
@@ -1618,319 +1765,258 @@ msgstr "طلب تسجيل"
 msgid "_Block User"
 msgstr "ا_منع المستخدم"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "غير مجمّع"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "الأشخاص الم�ضّلين"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "هل ترغب حقا بإزالة المجموعة '%s'؟"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
-msgid "Removing group"
-msgstr "إزالة مجموعة"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Remove"
-msgstr "أ_زل"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "هل ترغب حقا بإزالة المتراسل '%s'؟"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
-msgid "Removing contact"
-msgstr "حذ� المتراسل"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Add Contact…"
-msgstr "أ_ض� متراسلا…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:296
-msgid "_Block Contact"
-msgstr "ا_منع المتراسل"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:325
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
-msgid "_Chat"
-msgstr "_دردشة"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:356
-#: ../libempathy-gtk/empathy-individual-menu.c:560
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_مكالمة صوتية"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:387
-#: ../libempathy-gtk/empathy-individual-menu.c:602
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_مكالمة مرئية"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:433
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
-msgid "_Previous Conversations"
-msgstr "المحادثات ال_سابقة"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:455
-#: ../libempathy-gtk/empathy-individual-menu.c:686
-msgid "Send File"
-msgstr "أرسل مل�ا"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:478
-#: ../libempathy-gtk/empathy-individual-menu.c:728
-msgid "Share My Desktop"
-msgstr "شارك سطح مكتبي"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:518
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "م�ضّل"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:791
-msgid "Infor_mation"
-msgstr "_معلومات"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:593
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_حرّر"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:647
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
-msgid "Inviting you to this room"
-msgstr "يدعوك إلى هذه الغر�ة"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:678
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
-msgid "_Invite to Chat Room"
-msgstr "ا_دع إلى غر�ة المحادثة"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "ابحث عن المتراسلين"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
-msgstr "ابحث:"
+msgstr "ابحث: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "أ_ض� متراسلا"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "لم ي�عثَر على متراسلين"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "حدد متراسلا"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+msgid "Your message introducing yourself:"
+msgstr "رسالتك لتقديم ن�سك:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "الاسم الكامل:"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+msgid "Please let me see when you're online. Thanks!"
+msgstr "الرجاء دعني أرى عندما تكون متصلًا. شكرًا!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "رقم الهات�:"
+#: ../libempathy-gtk/empathy-contact-widget.c:568
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "القنوات:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "عنوان البريد:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:298
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "موقع الإنترنت:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:299
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "يوم الميلاد:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:748
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
-msgstr "رمز البلد"
+msgstr "رمز البلد:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:750
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "البلد:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:752
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "الولاية:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:754
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "المدينة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:756
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "المنطقة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "الرمز البريدي:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:760
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "الشارع:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "المبنى:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "الطابق:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "الغر�ة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "النص:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "الوص�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "المسار:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "مستوى الدقة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "خطأ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "خطأ رأسي (أمتار):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "خطأ أ�قي (أمتار):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "السرعة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "الطريقة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "سرعة التسلّق:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "آخر تحديث:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "خط الطول:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "دائرة العرض:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:794
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "الارت�اع:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:847
+#: ../libempathy-gtk/empathy-contact-widget.c:862
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "المكان"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:864
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "�%s، �%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:916
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B، %Y �ي %R ت‌ع‌م"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:998
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "اح�ظ الصور الشخصية"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1054
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "لا يمكن ح�ظ الصورة الشخصية"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "الاسم الكامل"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "رقم الهات�"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "عنوان البريد الإلكتروني"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "موقع الويب"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "الميلاد"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "آخر ظهور:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "متصل من:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "رسالة الغياب:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "عمل"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "المنزل"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "محمول"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "صوت"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "الم�ضّل"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "البريدي"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "الطرد"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>المكان</b> �ي (تاريخ)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "الكنية:"
 
@@ -1950,7 +2036,7 @@ msgstr "ت�اصيل المتراسل"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "المعر�:"
 
@@ -1967,11 +2053,11 @@ msgstr "نظام التشغيل:"
 msgid "Version:"
 msgstr "الإصدارة:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "المجموعات"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1979,21 +2065,21 @@ msgstr ""
 "انتق� المجموعات التي تود أن يظهر �يها هذا المتراسل، يمكنك انتقاء أكثر من "
 "مجموعة أو لا مجموعة."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "أ_ض� مجموعة"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "حدّد"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1951
 msgid "Group"
 msgstr "المجموعة"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "المعر�ّات التالية ست�منع:"
@@ -2003,7 +2089,7 @@ msgstr[3] "المعر�ّات التالية ست�منع:"
 msgstr[4] "المعر�ّات التالية ست�منع:"
 msgstr[5] "المعر�ّات التالية ست�منع:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "المعر�ّات التالية لن ت�منع:"
@@ -2013,48 +2099,160 @@ msgstr[3] "المعر�ّات التالية لن ت�منع:"
 msgstr[4] "المعر�ّات التالية لن ت�منع:"
 msgstr[5] "المعر�ّات التالية لن ت�منع:"
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "عدّل معلومات المتراسل"
+
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "المتراسلين المترابطين"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:372
 msgid "Select contacts to link"
 msgstr "حدد متراسلا لربطه"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:447
 msgid "New contact preview"
 msgstr "معاينة متراسل جديد"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:491
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "المتراسلين المحددين �ي القائمة على اليمين سيربطون إلى بعضهم البعض."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:181
 #, c-format
 msgid "%s (%s)"
 msgstr "�%s �(%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:363
+msgid "Select account to use to place the call"
+msgstr "حدد حسابًا ليستخدم لبدء المكالمة"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "اتصل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:432
+msgid "Mobile"
+msgstr "محمول"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:434
+msgid "Work"
+msgstr "عمل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:436
+msgid "HOME"
+msgstr "المنزل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:677
+msgid "_Block Contact"
+msgstr "ا_منع المتراسل"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "_دردشة"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1123
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_مكالمة صوتية"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1156
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_مكالمة مرئية"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "_Previous Conversations"
+msgstr "المحادثات ال_سابقة"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
+msgid "Send File"
+msgstr "أرسل مل�ا"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1256
+msgid "Share My Desktop"
+msgstr "شارك سطح مكتبي"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "م�ضّل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1310
+msgid "Infor_mation"
+msgstr "_معلومات"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1359
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_حرر"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1385
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "ا_ربط المتراسلين…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-menu.c:1501
+#: ../src/empathy-chat-window.c:1166
+msgid "Inviting you to this room"
+msgstr "يدعوك إلى هذه الغر�ة"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1547
+msgid "_Invite to Chat Room"
+msgstr "ا_دع إلى غر�ة المحادثة"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "أ_ض� متراسلا…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2307
 msgid "Delete and _Block"
 msgstr "احذ� وا_منع"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "هل ترغب حقا بإزالة المجموعة '%s'؟"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2345
+msgid "Removing group"
+msgstr "إزالة مجموعة"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2400
+#: ../libempathy-gtk/empathy-individual-view.c:2617
+msgid "_Remove"
+msgstr "أ_زل"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2477
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "هل ترغب حقا بإزالة المتراسل '%s'؟"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2486
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2063,16 +2261,20 @@ msgstr ""
 "أتريد حقا حذ� المتراسل المرتبط '%s'؟ لاحظ أن هذا سيحذ� كل المتراسلين التي "
 "يتشكل منها."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-view.c:2498
+msgid "Removing contact"
+msgstr "حذ� المتراسل"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] "متراسل مرتبط لا يحتوي أي متراسلين"
-msgstr[1] "متراسل مرتبط يحتوي متراسل واحد"
-msgstr[2] "متراسل مرتبط يحتوي متراسليْن"
-msgstr[3] "متراسل مرتبط يحتوي %u متراسلين"
-msgstr[4] "متراسل مرتبط يحتوي %u متراسلا"
-msgstr[5] "متراسل مرتبط يحتوي %u متراسل"
+msgstr[0] "متراسل مرتبط لا يحوي أي مراسلين"
+msgstr[1] "متراسل مرتبط يحوي مراسلا واحدا"
+msgstr[2] "متراسل مرتبط يحوي مراسليْن"
+msgstr[3] "متراسل مرتبط يحوي %u مراسلين"
+msgstr[4] "متراسل مرتبط يحوي %u مراسلا"
+msgstr[5] "متراسل مرتبط يحوي %u مراسل"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
@@ -2082,19 +2284,19 @@ msgstr "<b>المكان</b> �ي (تاريخ)"
 msgid "Online from a phone or mobile device"
 msgstr "متصل من هات� محمول أو جهاز نقال آخر"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "شبكة جديدة"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "اختر شبكة IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "ص�ّ�ر قائمة ال_شبكات"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "اختر"
@@ -2150,69 +2352,259 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "ا_�صل"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "التاريخ"
+#: ../libempathy-gtk/empathy-log-window.c:622
+msgid "History"
+msgstr "التأريخ"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "محادثات"
+#: ../libempathy-gtk/empathy-log-window.c:677
+msgid "Show"
+msgstr "أعرض"
+
+#: ../libempathy-gtk/empathy-log-window.c:699
+msgid "Search"
+msgstr "ابحث"
+
+#: ../libempathy-gtk/empathy-log-window.c:1150
+#, c-format
+msgid "Chat in %s"
+msgstr "دردشة �ي %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1152
+#, c-format
+msgid "Chat with %s"
+msgstr "دردشة مع %s"
+
+#: ../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: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:1297
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1373
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "ثانية"
+msgstr[1] "منذ ثانية واحدة"
+msgstr[2] "منذ ثانيتين"
+msgstr[3] "منذ %s ثوان"
+msgstr[4] "منذ %s ثانية"
+msgstr[5] "منذ %s ثانية"
+
+#: ../libempathy-gtk/empathy-log-window.c:1380
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "دقيقة"
+msgstr[1] "منذ دقيقة واحدة"
+msgstr[2] "منذ دقيقتين"
+msgstr[3] "منذ %s دقائق"
+msgstr[4] "منذ %s دقيقة"
+msgstr[5] "منذ %s دقيقة"
+
+#: ../libempathy-gtk/empathy-log-window.c:1388
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "المكالمة استغرقت %s، انتهت �ي %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1722
+msgid "Today"
+msgstr "اليوم"
+
+#: ../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:1741
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
+msgid "Anytime"
+msgstr "أي وقت"
+
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
+msgid "Anyone"
+msgstr "أي شخص"
+
+#: ../libempathy-gtk/empathy-log-window.c:2715
+msgid "Who"
+msgstr "من"
+
+#: ../libempathy-gtk/empathy-log-window.c:2924
+msgid "When"
+msgstr "متى"
+
+#: ../libempathy-gtk/empathy-log-window.c:3040
+msgid "Anything"
+msgstr "أي شيء"
+
+#: ../libempathy-gtk/empathy-log-window.c:3042
+msgid "Text chats"
+msgstr "دردشات نصية"
+
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "مكلمات"
+
+#: ../libempathy-gtk/empathy-log-window.c:3049
+msgid "Incoming calls"
+msgstr "مكالمات واردة"
+
+#: ../libempathy-gtk/empathy-log-window.c:3050
+msgid "Outgoing calls"
+msgstr "مكالمات صادرة"
+
+#: ../libempathy-gtk/empathy-log-window.c:3051
+msgid "Missed calls"
+msgstr "مكالمات �ائتة"
+
+#: ../libempathy-gtk/empathy-log-window.c:3073
+msgid "What"
+msgstr "ماذا"
+
+#: ../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:3786
+msgid "Clear All"
+msgstr "مسح الكل"
+
+#: ../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>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "ابحث عن التالي"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "محادثة"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "ابحث عن السابق"
+msgid "Delete All History..."
+msgstr "حذ� كل التاريخ..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "المحادثات السابقة"
+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 "�ديو"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "ابحث"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "ت_حرير"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_مل�"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_عن:"
+msgid "page 2"
+msgstr "ص�حة 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "معرّ� المتراسل:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "المتراسل غير متّصل"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
-msgid "C_hat"
-msgstr "ا_بدأ محادثة"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "المتراسل المحدد إما غير صالح أو مجهول"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "المتراسل لايدعم هذا النوع من المحادثة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "الوظي�ة المطلوبة غير مجهزّة لهذا البروتوكول"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "تعذر بدء محادثة مع المتراسل المحدد"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "أنت ممنوع �ي هذه القناة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "هذه القناة ممتلئة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "لا ب�د أن تكون مدعوًا لكي تنضم لهذه القناة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "لايمكن المتابعة خلال انقطاع الاتصال"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "ر��ض التّصريح"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "حدث خطأ أثناء بدء المحادثة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "أدخل م�عرّ�� المتراسل أو رقم الهات�:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "محادثة جديدة"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
-msgid "Send _Video"
-msgstr "أرسل _�يديو"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "مكالمة مرئ_ية"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
-msgid "C_all"
-msgstr "ا_تصل"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "مكالمة صو_تية"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../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 "Authentification failed for account <b>%s</b>"
+msgstr "�َش�ل الاستيثاق للحساب <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2227,34 +2619,30 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "رسالة مخصّصة…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "حرر الرسائل المخصّصة…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "انقر لإزالة كون هذه الحالة هي الم�ضلة"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "انقر لجعل هذه الحالة هي الم�ضلة"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "حدد الحالة"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
-msgid "Set your presence and current status"
-msgstr "حدد تواجدك وحالتك الحالية"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "الرسائل المخصصة…"
 
@@ -2267,18 +2655,26 @@ msgstr "الرسائل المخصصة…"
 msgid "New %s account"
 msgstr "حساب %s جديد"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "ابحث:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "طاب�ق حالة الأحر�"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "_طابق حالة الأحر�"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../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:5
+msgid "_Previous"
+msgstr "ال_سابق"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "وصلت رسالة �ورية"
@@ -2319,35 +2715,32 @@ msgstr "مكالمة صوتية صادرة"
 msgid "Voice call ended"
 msgstr "أنهيت المكالمة الصوتية"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "حرر الرسالة المخصّصة"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "حرر الرسائل المخصّصة"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "اح�ظ رسالة _حالة جديدة"
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#, c-format
+msgid "Message edited at %s"
+msgstr "ح�ر�رَت الرسالة �ي %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "رسائل الحالة المح�وظة"
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
+msgid "Normal"
+msgstr "عادي"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "تقليدي"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "بسيط"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "نظي�"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "أزرق"
 
@@ -2411,37 +2804,41 @@ 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:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "تعذّر �تح المسار"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "اختر مل�ا"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "لا توجد مساحة خالية ك�اية لح�ظ المل�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "مطلوب %s مساحة خالية لح�ظ المل� لكن لا يتو�ر إلا %s. اختر مكانا آخر."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "مل� وارد من %s"
@@ -2613,39 +3010,31 @@ msgstr "غربي"
 msgid "Vietnamese"
 msgstr "�يتنامي"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "الم�تراسل المحدد لا يستطيع استقبال مل�ات."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "المتراسل المحدد غير متّصل."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "لا رسالة خطأ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "رسالة �ورية (إمبَثي)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "لا تتصل عند بدء التشغيل"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "لا تعرض قائمة المتراسلين أو أي حوارات أخرى عند بدء التشغيل"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "- المرسال إمبثي"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "ع�طل أثناء الاتصال بمدير الحسابات"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2686,14 +3075,14 @@ msgid ""
 msgstr ""
 "من الم�ترض أنك تلقيت نسخة من رخصة جنو العمومية مع هذا البرنامج؛ إذا لم يحدث "
 "هذا �اكتب إلى:\n"
-"Free Software Fondation Inc., 59 Temple Place - Suite 330, Boston, MA 02111 "
-"- 1307, USA"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "عميل مراسلة �ورية لجنوم"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "�ريق عربآيز للترجمة http://www.arabeyes.org :\n"
@@ -2730,38 +3119,39 @@ msgid ""
 "this assistant and add accounts later from the Edit menu."
 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 "
@@ -2772,41 +3162,41 @@ msgstr ""
 "أو Windows Live والكثير من برامج الدردشة الأخرى. وباستخدام ميكرو�ون وكاميرا "
 "تستطيع إجراء محادثات بالصوت والصورة."
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "هل لديك حساب كنت تستخدمه مع برنامج دردشة آخر؟"
 
-#: ../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:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../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 "
@@ -2815,106 +3205,117 @@ msgid ""
 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 "
 "install the telepathy-salut package and create a People Nearby account from "
 "the Accounts dialog"
 msgstr ""
-"لن تستطيع الدردشة مع الأشخاص المتصلين معك على ن�س الشبكة، لأن telepathy-"
-"salut غير مثبت. إذا أردت ت�عيل هذه الخاصية �من �ضلك ثبّت حزمة telepathy-salut "
-"ثم أنشئ حساب 'أشخاص قريبون' من حوار 'الحسابات"
+"لن تستطيع الدردشة مع الأشخاص المتصلين معك على ن�س الشبكة لأن telepathy-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:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../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:327
+#: ../src/empathy-accounts-dialog.c:385
 #, c-format
 msgid "Offline — %s"
 msgstr "غير متصل — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:397
 #, c-format
 msgid "Disconnected — %s"
 msgstr "قطع الاتصال — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:408
 msgid "Offline — No Network Connection"
 msgstr "غير متصل — لا اتصال شبكي"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:415
 msgid "Unknown Status"
 msgstr "حالة مجهول"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:427
 msgid "Offline — Account Disabled"
 msgstr "غير متصل — ع�طّل الحساب"
 
-#: ../src/empathy-accounts-dialog.c:772
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:530
+#, fuzzy
+#| 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 ""
-"أنت على وشك إنشاء حساب جديد، والذي سيتجاهل تعديلاتك.\n"
-"أم�تأكد أنك ترغب �ي إتمام العملية؟"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../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:1137
+#: ../src/empathy-accounts-dialog.c:1293
 msgid "This will not remove your account on the server."
 msgstr "لن يزيل هذا حسابك على الخادوم."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../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?"
@@ -2923,15 +3324,15 @@ msgstr ""
 "أم�تأكد أنك ترغب �ي إتمام العملية؟"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1571
+#: ../src/empathy-accounts-dialog.c:1705
 msgid "_Enable"
 msgstr "_�عّل"
 
-#: ../src/empathy-accounts-dialog.c:1572
+#: ../src/empathy-accounts-dialog.c:1706
 msgid "_Disable"
 msgstr "_عطّل"
 
-#: ../src/empathy-accounts-dialog.c:2086
+#: ../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?"
@@ -2940,18 +3341,22 @@ msgstr ""
 "أم�تأكد أنك ترغب �ي إتمام العملية؟"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "أض�…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "يحمّل معلومات الحساب"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "لم يثبّت أي بروتوكول"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "البروتوكول:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2959,19 +3364,15 @@ msgstr ""
 "لإضا�ة حساب جديد، عليك أولا بتثبيت الخل�ية المناسبة لكل بروتوكول تود "
 "استعماله."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "أ_ض�…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "ا_ستورد…"
 
-#: ../src/empathy-auth-client.c:246
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - عميل استيثاق إمبثي"
 
-#: ../src/empathy-auth-client.c:262
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "عميل استيثاق إمبثي"
 
@@ -2979,108 +3380,120 @@ msgstr "عميل استيثاق إمبثي"
 msgid "People nearby"
 msgstr "مع أصدقاء"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
 msgid "- Empathy Audio/Video Client"
 msgstr "- المرسال إمبثي"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
 msgid "Empathy Audio/Video Client"
 msgstr "المرسال إمبثي"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "التباين"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "السطوع"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "جاما"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "الحجم"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "الشريط ال_جانبي"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "مدخلات الصوت"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "مدخلات ال�يديو"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "لوحة الأرقام"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../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:1274
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
 #, c-format
 msgid "Call with %s"
 msgstr "اتصل باستخدام %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "اتصل"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../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:1509
+#: ../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:1511
+#: ../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:1513
+#: ../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:1515
+#: ../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:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+msgctxt "codec"
+msgid "Unknown"
+msgstr "مجهول"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "متَصل — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2327
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
 msgid "Technical Details"
 msgstr "الت�اصيل التقنية"
 
-#: ../src/empathy-streamed-media-window.c:2365
+#: ../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:2370
+#: ../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:2376
+#: ../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 "
@@ -3088,143 +3501,238 @@ msgid ""
 msgstr ""
 "تعذّر إنشاء اتصال مع %s. قد يكون أحدكما �ي شبكة لا تسمح بالاتصالات المباشرة."
 
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../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:2386
+#: ../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:2389
+#: ../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:2399
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 msgstr ""
-"حدث أمر غير متوقع �ي مكون تليباثي. من �ضلك <a href=\"%s\">أبلغ عن هذه العلة</"
-"a> وأر�ق السجل المجمع �ي نا�ذة 'نقح' من قائمة 'مساعدة'."
+"حدث أمر غير متوقع �ي مكون تليباثي. من �ضلك <a href=\"%s\">أبلغ عن هذه "
+"العلة</a> وأر�ق السجل المجمع �ي نا�ذة 'نقح' من قائمة 'مساعدة'."
 
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../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:2410
+#: ../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:2450
+#: ../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:2460
+#: ../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-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "صوت"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "اتصل بالمتراسل ثانيا"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "عطل الكمرة"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "مرماز ال�ك:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "�عّل الكمرة"
+msgid "Disable camera"
+msgstr "عطّل الكاميرا"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "مرماز ال�ك:"
+msgid "Display the dialpad"
+msgstr "اعرض لوح الاتصال"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "عطل الكمرة وتوق� عن إرسال ال�ديو"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "مرماز الترميز:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "�عّل الكمرة وأرسل �ديو"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "علّق"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "�عّل الكمرة ولا ترسل �ديو"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "علّق المكالمة الحالية"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "مرماز الترميز:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "المرشح المحلي:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "علّق"
+msgid "Maximise me"
+msgstr "تكبير"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "علّق المكالمة الحالية"
+msgid "Minimise me"
+msgstr "تصغير"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "المرشح المحلي:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "المرشح البعيد:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "معاينة"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "أرسل مل� صوتي"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "أع�د الاتصال"
+msgid "Send Video"
+msgstr "إرسال �يديو"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "المرشح البعيد:"
+msgid "Show dialpad"
+msgstr "أظهر لوح اتصال"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "أرسل مل� صوتي"
+msgid "Start a video call"
+msgstr "ابدأ مكالمة �يديو"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "بدل نقل الصوت"
+msgid "Start an audio call"
+msgstr "ابدأ مكالمة صوتية"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "تبديل الكاميرا"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "_�ديو"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "بدل نقل الصوت"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "�ديو"
+msgid "Toggle video transmission"
+msgstr "بدل نقل ال�يديو"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "عطّل ال�ديو"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "�عّل ال�ديو"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+msgid "Unknown"
+msgstr "مجهول"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "معاينة ال�يديو"
+msgid "Video call"
+msgstr "مكالمة �يديو"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_اتصال"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../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-roster-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "الم_حتويات"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_نقّح"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "م_ساعدة"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_الميكرو�ون"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "إ_عدادات"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_عرض"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:285
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "هل تريد غلق هذه النا�ذة؟"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:301
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: ../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
+#, fuzzy
+#| 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)"
@@ -3235,7 +3743,7 @@ msgstr[3] "%s (%d غير مقروة)"
 msgstr[4] "%s (%d غير مقروة)"
 msgstr[5] "%s (%d غير مقروة)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3246,7 +3754,7 @@ msgstr[3] "%s (و %u أخرى)"
 msgstr[4] "%s (و %u أخرى)"
 msgstr[5] "%s (و %u أخرى)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3257,7 +3765,7 @@ msgstr[3] "%s (%d غير مقروة من الآخرين)"
 msgstr[4] "%s (%d غير مقروة من الآخرين)"
 msgstr[5] "%s (%d غير مقروة من الآخرين)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3268,9 +3776,24 @@ msgstr[3] "%s (%d غير مقروة من الكل)"
 msgstr[4] "%s (%d غير مقروة من الكل)"
 msgstr[5] "%s (%d غير مقروة من الكل)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:888
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:898
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] ""
+msgstr[1] "يرسل رسالة"
+msgstr[2] "يرسل رسالتين"
+msgstr[3] "يرسل %d رسائل"
+msgstr[4] "يرسل %d رسالة"
+msgstr[5] "يرسل %d رسالة"
+
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
-msgstr "يكتب رسالة..."
+msgstr "يكتب رسالة."
 
 #: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
@@ -3280,17 +3803,13 @@ msgstr "ا_مسح"
 msgid "C_ontact"
 msgstr "ا_تصل"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "محادثة"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "أدرج تعبيرا ر_سوميا"
 
 #: ../src/empathy-chat-window.ui.h:5
 msgid "Invite _Participant…"
-msgstr "ادع� ال_مشارك…"
+msgstr "ادع� شخصا لهذه ال_محادثة…"
 
 #: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
@@ -3304,10 +3823,6 @@ msgstr "انقل اللّ�سان إلى ال_يمين"
 msgid "Notify for All Messages"
 msgstr "أبلغ بكل الرسائل"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "الم_حتويات"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "م_حادثة"
@@ -3316,18 +3831,10 @@ msgstr "م_حادثة"
 msgid "_Detach Tab"
 msgstr "_�صل اللسان"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "ت_حرير"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "الغر�ة الم_�ضلة"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "م_ساعدة"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "اللسان ال_تالي"
@@ -3348,15 +3855,15 @@ msgstr "أ_لسنة"
 msgid "_Undo Close Tab"
 msgstr "_تراجع عن غلق اللسان"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "اسم"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "غر�ة"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "اتصل تلقائيا"
 
@@ -3364,90 +3871,96 @@ msgstr "اتصل تلقائيا"
 msgid "Manage Favorite Rooms"
 msgstr "أدر الغر� الم�ضّلة"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "مكالمة صوت وصورة واردة"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "مكالمة واردة"
 
-#: ../src/empathy-event-manager.c:511
+#: ../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:512
+#: ../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:515 ../src/empathy-event-manager.c:660
+#: ../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:540
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "_ار�ض"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
-msgstr "_أجب"
+msgstr "أ_جب"
+
+#: ../src/empathy-event-manager.c:572
+msgid "_Answer with video"
+msgstr "إ_جابة مع �يديو"
 
-#: ../src/empathy-event-manager.c:660
+#: ../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:737
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "دعوة غر�ة"
 
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "دعوة للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "يدعوك %s للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "ا_ر�ض"
 
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:860
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "ان_ضم"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "دعاك %s للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "لقد د�عيت للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "مل� وارد من %s"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372
 msgid "Password required"
 msgstr "كلمة السر مطلوبة"
 
-#: ../src/empathy-event-manager.c:1069
+#: ../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:1073
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3460,13 +3973,13 @@ msgstr ""
 #: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
-msgstr "%u:%02u.%02u"
+msgstr "%u:%02u:%02u"
 
 #. Translators: time left, when is is less than one hour
 #: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
-msgstr "%02u.%02u"
+msgstr "%02u:%02u"
 
 #: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
@@ -3533,7 +4046,7 @@ msgstr "\"%s\" أ�رسل إلى %s"
 msgid "File transfer completed"
 msgstr "تم نقل المل�"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "بانتظار رد الشخص الآخر"
 
@@ -3547,15 +4060,15 @@ msgstr "يتحقق من سالة \"%s\""
 msgid "Hashing \"%s\""
 msgstr "ي�لبّد \"%s\""
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
-msgstr "Ùª"
+msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "مل�"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "الباقي"
 
@@ -3579,153 +4092,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:387
+#: ../src/empathy-roster-window.c:389
 msgid "Provide Password"
 msgstr "أدخل كلمة السر"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-roster-window.c:395
 msgid "Disconnect"
 msgstr "ا�صل"
 
-#: ../src/empathy-main-window.c:533
+#: ../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:688
+#: ../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:694
+#: ../src/empathy-roster-window.c:948
 msgid "Edit Account"
 msgstr "حر�ر الحساب"
 
-#: ../src/empathy-main-window.c:700
-msgid "Close"
-msgstr "نظي�"
-
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1092
+#, c-format, fuzzy
+msgid "Top up %s (%s)..."
+msgstr "تحريك %s (%s) للأعلى..."
+
+#: ../src/empathy-roster-window.c:1138
+#, fuzzy
+msgid "Top up account credit"
+msgstr "تحريك رصيد الحساب إلى الأعلى"
+
+#. top up button
+#: ../src/empathy-roster-window.c:1210
+#, fuzzy
+msgid "Top Up..."
+msgstr "تحريك للأعلى..."
+
+#: ../src/empathy-roster-window.c:1933
 msgid "Contact"
 msgstr "متراسل"
 
-#: ../src/empathy-main-window.c:1765
+#: ../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 ""
+
+#: ../src/empathy-roster-window.c:2419
 msgid "Contact List"
 msgstr "قائمة المتراسلين"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "اعرض و _حرّر الحسابات"
+#: ../src/empathy-roster-window.ui.h:1
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "إعدادات الحساب"
 
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "المتراسلين على ال_خريطة"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "رصيد الحساب"
+
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "ابح_ث �ي قائمة المتراسلين"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "ان_ض�م إلى الم�ضلين"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "أدر الم�ضلة"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "حجم _عادي"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "مكالمة _جديدة…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "حجم عادي مع أي_قونات"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "الت_�ضيلات"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "أظهر البروتو_كولات"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "رتب حسب الا_سم"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "رتّب حسب ال_حالة"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "ال_حسابات"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "المتراسلين الم_منوعين"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "حجم _مضغوط"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_نقّح"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_نقل المل�ات"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "ان_ضم…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_محادثة جديدة…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "المتراسلين _غير المتَّصلين"
 
-#: ../src/empathy-main-window.ui.h:25
-msgid "_Personal Information"
-msgstr "الم_علومات الشخصية"
-
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "_غر�ة"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 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:560
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -3738,16 +4291,16 @@ msgstr ""
 "مطلوب كلمة سر: %s\n"
 "الأعضاء: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "لا"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "تعذّر بدء سرد الغر�"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "تعذّر إيقا� سرد الغر�"
 
@@ -3782,39 +4335,80 @@ msgstr "قائمة الغر�"
 msgid "_Room:"
 msgstr "ال_غ�ر�ة:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "تم إستلام الرسالة"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "أرسلت الرسالة"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "محادثة جديدة"
 
-#: ../src/empathy-preferences.c:142
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+#| msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "اتصل المتراسل"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "ان�صل المتراسل"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "الحساب متصل"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "الحساب غير متصل"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "اللغة"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:726
+msgid "Juliet"
+msgstr ""
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:733
+msgid "Romeo"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:739
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:743
+msgid "Deny thy father and refuse thy name;"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:746
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:749
+msgid "And I'll no longer be a Capulet."
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:752
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:755
+msgid "Juliet has disconnected"
+msgstr ""
+
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "الت�ضيلات"
 
@@ -3822,138 +4416,165 @@ msgstr "الت�ضيلات"
 msgid "Appearance"
 msgstr "المظهر"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "السلوك"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "_سمة المحادثة:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
-msgstr "عطل التنبيهات عندما أكون بعيدا أو مشغولا"
+msgstr "عطل التنبيهات عندما أكون _بعيدا أو مشغولا"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
-msgstr "عطل الأصوات عندما أكون بعيدا أو مشغولا"
+msgstr "عطل الأ_صوات عندما أكون بعيدا أو مشغولا"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
-msgstr "اعرض الأحداث القادمة �ي منطقة التنبيهات"
+msgstr "اعرض الأحداث الواردة �ي منطقة التنبيهات"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"يساعد إلغاء الصدى على جعل صوتك أوضح للشخص الآخر، ولكنه قد يسبب مشاكل على بعض "
+"الحواسب. إذا كنت تسمع أنت أو الشخص الآخر ضوضاء غريبة أو جلبة خلال المكالمات، "
+"حاول إيقا� إلغاء الصدى وقم بإعادة تشغيل المكالمة."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "�عّل التنبيهات عندما يصبح المتراسل على الخط"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "�عّل التنبيهات عندما يصبح المتراسل غير متصل"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
-msgstr "�عّل التنبيهات عندما تكون المحادثة غير مركز عليها"
+msgstr "�عّل التنبيهات عندما تكون الم_حادثة غير مركز عليها"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "�عل تدقيق التهجئة للغات:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "عامّ"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:16
 msgid "Location sources:"
 msgstr "مصدر المكان:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "سجّل المحادثات"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "التنبيهات"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "شغل صوت للأحداث"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "الخصوصية"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
-"دقة المكان المنخ�ضة تعني أن لا شيء أدق من المدينة والمحا�ظة والدولة سي�نشر.  "
-"إحداثيات نظام تحديد المواقع ستكون بدقة خانة عشرية واحدة. "
+"دقة المكان المنخ�ضة تعني أن لا شيء أدق من المدينة والمحا�ظة والدولة سي�نشر. "
+"إحداثيات نظام تحديد المواقع ستكون بدقة خانة عشرية واحدة."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "أظهر الابت_سامات كرسوم"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "أظهر _قائمة المتراسلين �ي الغر�"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "الأصوات"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "التدقيق الإملائي"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "قائمة اللغات الموجودة هنا لا تعكس إلا اللغات التي يوجد لها قاموس مركب."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "الس�مات"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
+msgid "Use _echo cancellation to improve call quality"
+msgstr "استخدم إلغاء ال_صدى لتحسين جودة المكالمة"
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "الشكل:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_اتّصل آليا عند بدء التَّشغيل"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_هات� محمول"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_�عّل بالون التنبيهات"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_�عّل التنبيهات الصوتية"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_نظام المواقع الجغرا�ي"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "ال_شبكة (رقم الإنترنت، لا سلكي)"
 
-#: ../src/empathy-preferences.ui.h:31
-msgid "_Open new chats in separate windows"
-msgstr "ا_�تح غر� الدردشة الجديدة �ي نوا�ذ من�صلة"
-
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "ا_نشر مكاني إلى المتراسلين"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "_قلل دقة المكان"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr ""
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "الحالة"
@@ -3962,82 +4583,130 @@ msgstr "الحالة"
 msgid "_Quit"
 msgstr "أ_نه"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "اتصل بالمتراسل ثانيةً"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "عطل الكاميرا"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "�عّل الكاميرا"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "عطل الكاميرا وتوق� عن إرسال ال�ديو"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "�عّل الكاميرا وأرسل �ديو"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "�عّل الكاميرا ولا ترسل �ديو"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "معاينة"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "أع�د الاتصال"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "_�ديو"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "عطّل ال�ديو"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "�عّل ال�ديو"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "معاينة ال�يديو"
+
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "مشهد خريطة المتراسَلين"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "اح�ظ"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "نا�ذة التنقيح"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "ألب�ث"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
-msgstr "المستوى"
+msgstr "المستوى "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "تنقيح"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "معلومات"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "رسالة"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "حر�ج"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "خطأ"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "الوقت"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "النطاق"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "ال�ئة"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "المستوى"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "مدير الاتصالات المختار لا يدعم امتداد التنقيح عن بعد."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
-msgstr "ادع� المشارك"
+msgstr "ادع� للمشاركة"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "اختر متراسلا لدعوته إلى المحادثة:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "ادع�"
 
@@ -4058,15 +4727,27 @@ msgstr "حدد الحساب المعطى (مثلا gabble/jabber/foo_40example_2
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:196
+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:66
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "أظهر خدمة محددة"
+
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- منقّح إمبثي"
+
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "منقّح إمبثي"
 
@@ -4074,37 +4755,204 @@ msgstr "منقّح إمبثي"
 msgid "- Empathy Chat Client"
 msgstr "- مرسال الدردشة إمبثي"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "استجب"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1565
 msgid "Reject"
 msgstr "ار�ض"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../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:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:214
+msgid "Answer with video"
+msgstr "أجابة مع �يديو"
+
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr "لا ت�جب"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
 msgid "Accept"
 msgstr "اقبل"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "مكالمة �ائتة م�ن %s"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:247
+msgid "Provide"
+msgstr ""
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "حاول %s الاتصال بك قبل قليل لكنك كنت مشغولا بمكالمة أخرى."
 
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2929
+msgid "On hold"
+msgstr "قيد الانتظار"
+
+#: ../src/empathy-call-window.c:2932
+msgid "Mute"
+msgstr "أكتم"
+
+#: ../src/empathy-call-window.c:2934
+msgid "Duration"
+msgstr "المدة"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2937
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02d"
+
+#: ../src/empathy-call-window.c:3207
+#, c-format
+msgid "Your current balance is %s."
+msgstr "رصيدك الحالي هو %s."
+
+#: ../src/empathy-call-window.c:3211
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "عذرًا، لا تملك رصيدًا كا�يًا لهذه المكالمة."
+
+#: ../src/empathy-call-window.c:3213
+#, fuzzy
+msgid "Top Up"
+msgstr "تحريك للأعلى"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_طاب�ق حالة الأحر�"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+#, fuzzy
+#| msgid "New account"
+msgid "Adding new account"
+msgstr "حساب جديد"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "نوع المقبس غير مدعوم"
+
+#~| msgid "Launch My Web Accounts"
+#~ msgid "My Web Accounts"
+#~ msgstr "حسابات الوب خاصتي"
+
+#~| msgid "The account %s is edited via My Web Accounts."
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "الحساب %s ح�ر�رَ من خلال %s"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "لا يمكن تحرير الحساب %s �ي إمبثي."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "شغّل \"حسابات الوب\""
+
+#~| msgid "_Edit"
+#~ msgid "Edit %s"
+#~ msgstr "تحرير %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "أ_لغ�"
+
+#~ msgid "Personal Information"
+#~ msgstr "المعلومات الشخصية"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_حرّر"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "أنت على وشك إنشاء حساب جديد، والذي سيتجاهل تعديلاتك.\n"
+#~ "أم�تأكد أنك ترغب �ي إتمام العملية؟"
+
+#~ msgid "_Personal Information"
+#~ msgstr "الم_علومات الشخصية"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "ا_�تح غر� الدردشة الجديدة �ي نوا�ذ من�صلة"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "رحّل إمبثي سجلات butterfly"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "�يما إذا كان إمبثي رحّل سجلات butterfly."
+
+#~ msgid "All"
+#~ msgstr "الكل"
+
+#~ msgid "_Enabled"
+#~ msgstr "_م�عّل"
+
+#~ msgid "Ungrouped"
+#~ msgstr "غير مجمّع"
+
+#~ msgid "Favorite People"
+#~ msgstr "الأشخاص الم�ضّلين"
+
+#~ msgid "Select a contact"
+#~ msgstr "حدد متراسلا"
+
+#~ msgid "Date"
+#~ msgstr "التاريخ"
+
+#~ msgid "Conversations"
+#~ msgstr "محادثات"
+
+#~ msgid "Find Next"
+#~ msgstr "ابحث عن التالي"
+
+#~ msgid "Find Previous"
+#~ msgstr "ابحث عن السابق"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "المحادثات السابقة"
+
+#~ msgid "_For:"
+#~ msgstr "_عن:"
+
+#~ msgid "Contact ID:"
+#~ msgstr "معرّ� المتراسل:"
+
+#~ msgid "C_hat"
+#~ msgstr "ا_بدأ محادثة"
+
+#~ msgid "C_all"
+#~ msgstr "ا_تصل"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "حدد تواجدك وحالتك الحالية"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "حرر الرسالة المخصّصة"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "اح�ظ رسالة _حالة جديدة"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "رسائل الحالة المح�وظة"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "الم�تراسل المحدد لا يستطيع استقبال مل�ات."
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "اعرض و _حرّر الحسابات"
+
 #~ msgid "Context"
 #~ msgstr "السياق"
diff --git a/po/be.po b/po/be.po
index ffa1324be..9d196cf9a 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 23:43+0300\n"
-"PO-Revision-Date: 2011-12-28 23:44+0300\n"
+"POT-Creation-Date: 2012-02-20 17:08+0300\n"
+"PO-Revision-Date: 2012-02-20 17:08+0300\n"
 "Last-Translator: Kasia Bondarava <kasia.bondarava@gmail.com>\n"
 "Language-Team: Belarusian <be-i18n-gnome@googlegroups.com>\n"
 "Language: be\n"
@@ -18,484 +18,505 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Чат у Google Talk, Facebook, MSN ды інш."
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Інт�рн�т-камунікатар"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Інт�рн�т-камунікатар Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Інт�рн�т-камунікатар"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Чат у Google Talk, Facebook, MSN ды інш."
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "Конты камунікатара і VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Кіраванне контамі камунікатара і VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Заў�ёды адкрываць новае акно дл� новага чату."
+msgid "Connection managers should be used"
+msgstr "Тр�ба выкары�тоўваць кіраўнікоў злуч�нн�ў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Пры�та�аванне від�акамеры"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Ці тр�ба выкары�тоўваць кіраўнікоў злуч�нн�ў дл� аўтаматычнага адлуч�нн�/"
+"перазлуч�нн�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Разм�шч�нне від�акамеры"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy му�іць аўтаматычна злучацца пры запу�ку"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Знак, �кі тр�ба ў�таўл�ць па�л� м�нушкі пры �е дапаўненні клавішай Тab у "
-"групавым чаце."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Ці му�іць Empathy аўтаматычна злучацца з �еткамі пры запу�ку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Матыў акна чату"
+msgid "Empathy should auto-away when idle"
+msgstr ""
+"Empathy му�іць аўтаматычна пераходзіць у р�жым ад�утна�ці пры б�здзейна�ці"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "�дмена матыва акна чату"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Спі� моў дл� праверкі арфаграфіі, падзеленых ко�камі (напрыклад, \"en, be, ru"
-"\")."
+"Ці му�іць Empathy аўтаматычна пераходзіць у р�жым ад�утна�ці пры "
+"б�здзейна�ці кары�тальніка."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Empathy default download folder"
+msgstr "Прадвызначана� папка дл� �ц�гнутых файлаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Кампактны �пі� кантактаў"
+msgid "The default folder to save file transfers in."
+msgstr "Прадвызначана� папка дл� захаванн� атрыманых файлаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Тр�ба выкары�тоўваць кіраўнікоў злуч�нн�ў"
+msgid "Show offline contacts"
+msgstr "Паказваць паза�еткавы� кантакты"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Крыт�рый �артаванн� �пі�а кантактаў"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Ці тр�ба паказваць паза�еткавы� кантакты ў �пі�е кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
-"Сцежка аб'екта D-Bus, зв�занага з апошнім контам, абраным дл� ўваходу ў "
-"пакой."
+msgid "Show avatars"
+msgstr "Паказваць аватары"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Прадвызначанае пры�та�аванне від�акамеры дл� від�аразмоў, напрыклад \"/dev/"
-"video0\"."
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Ці тр�ба паказваць аватары ў �пі�е кантактаў і вокнах чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Прадвызначаны каталог дл� выбару аватар"
+msgid "Show protocols"
+msgstr "Паказваць інфармацыю аб пратаколе"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "�е паказваць выплыўны� апав�шч�нні ў р�жыме ад�утна�ці"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Ці тр�ба паказваць інфармацыю аб пратаколе ў �пі�е кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "�е ўжываць гукавы� �ігналы ў р�жыме ад�утна�ці"
+msgid "Show Balance in contact list"
+msgstr "Паказваць балан� рахунку у �пі�е кантактаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Паказваць уваходны� падзеі ў абшары �тану"
+msgid "Whether to show account balances in the contact list."
+msgstr "Ці тр�ба паказваць балан� контаў у �пі�е кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Паказваць уваходны� падзеі ў абшары �тану. Калі выключана, адразу паказваць "
-"іх кары�тальніку."
+msgid "Compact contact list"
+msgstr "Кампактны �пі� кантактаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Падтрымка фільтрацыі р�ха"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Ці тр�ба паказваць �пі� кантактаў у кампактным р�жыме."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy можа публікаваць ме�цазнаходжанне кары�тальніка"
+msgid "Hide main window"
+msgstr "Схаваць галоўнае акно"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy можа выкары�тоўваць GPS дл� вызнач�нн� ме�цазнаходжанн�"
+msgid "Hide the main window."
+msgstr "Схаваць галоўнае акно."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
-"Empathy можа выкары�тоўваць �отавую �етку дл� вызнач�нн� ме�цазнаходжанн�"
+msgid "Default directory to select an avatar image from"
+msgstr "Прадвызначаны каталог дл� выбару аватар"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy можа выкары�тоўваць �етку дл� вызнач�нн� ме�цазнаходжанн�"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "�пошні каталог, з �кога была выбрана аватара."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Прадвызначана� папка дл� �ц�гнутых файлаў"
+msgid "Open new chats in separate windows"
+msgstr "�дкрываць новы� чаты ў а�обных вокнах"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr ""
-"Empathy му�іць аўтаматычна пераходзіць у р�жым ад�утна�ці пры б�здзейна�ці"
+msgid "Always open a separate chat window for new chats."
+msgstr "Заў�ёды адкрываць новае акно дл� новага чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy му�іць аўтаматычна злучацца пры запу�ку"
+msgid "Display incoming events in the status area"
+msgstr "Паказваць уваходны� падзеі ў абшары �тану"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy му�іць пагаршаць дакладна�ць ме�цазнаходжанн�"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Паказваць уваходны� падзеі ў абшары �тану. Калі выключана, адразу паказваць "
+"іх кары�тальніку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy му�іць выкары�тоўваць аватару кантакта �к значок дл� акна чату"
+msgid "The position for the chat window side pane"
+msgstr "Разм�шч�нне бакавога абшару ў акне чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Уключыць прылады ра�працоўшчыка WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Захаванае разм�шч�нне бакавога абшару ў акне чату (у пік�елах)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Ужываць выплыўны� апав�шч�нні дл� новых паведамленн�ў"
+msgid "Show contact groups"
+msgstr "Паказваць групы кантактаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Прав�раць арфаграфію"
+msgid "Whether to show groups in the contact list."
+msgstr "Ці тр�ба паказваць групы ў �пі�е кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Схаваць галоўнае акно"
+msgid "Contact list sort criterion"
+msgstr "Крыт�рый �артаванн� �пі�а кантактаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Схаваць галоўнае акно."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Крыт�рый �артаванн� �пі�а кантактаў. Прадвызначаны� паводзіны - �артаваць "
+"паводле �тану кантактаў - уключаюцца знач�ннем \"state\". Знач�нне \"name\" "
+"уключыць �артаванне паводле імёнаў кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "�пошні конт, выбраны ў ды�логу ўваходу ў пакой"
+msgid "Use notification sounds"
+msgstr "�гучваць апав�шч�нні"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Знак па�л� дапоўненай м�нушкі"
+msgid "Whether to play a sound to notify of events."
+msgstr "Ці тр�ба агучваць падзеі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "�дкрываць новы� чаты ў а�обных вокнах"
+msgid "Disable sounds when away"
+msgstr "�е ўжываць гукавы� �ігналы ў р�жыме ад�утна�ці"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Сцежка да патр�бнага матыва Adium"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Ці тр�ба ўжываць гукавы� �ігналы ў р�жыме ад�утна�ці ці зан�та�ці."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Сцежка да патр�бнага матыва Adium, калі дл� чату ўжыты матыў Adium."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "�гучваць уваходны� паведамленні"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "�гучваць з'�ўленне новых размоў"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Ці тр�ба агучваць уваходны� паведамленні."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for outgoing messages"
 msgstr "�гучваць выхадны� паведамленні"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Ці тр�ба агучваць выхадны� паведамленні."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "�гучваць уваход кантакта ў �етку"
+msgid "Play a sound for new conversations"
+msgstr "�гучваць з'�ўленне новых размоў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "�гучваць выхад кантакта з �еткі"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Ці тр�ба агучваць з'�ўленне новых размоў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "�гучваць злуч�нне з �еткай"
+msgid "Play a sound when a contact logs in"
+msgstr "�гучваць уваход кантакта ў �етку"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "�гучваць адлуч�нне ад �еткі"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Ці тр�ба агучваць уваход кантактаў у �етку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Ужываць выплыўны� апав�шч�нні, калі чат не мае фоку�у"
+msgid "Play a sound when a contact logs out"
+msgstr "�гучваць выхад кантакта з �еткі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Ужываць выплыўны� апав�шч�нні дл� ўваходу кантакта ў �етку"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Ці тр�ба агучваць выхад кантактаў з �еткі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Ужываць выплыўны� апав�шч�нні дл� выхаду кантакта з �еткі"
+msgid "Play a sound when we log in"
+msgstr "�гучваць злуч�нне з �еткай"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Разм�шч�нне карцінкі з від�акамеры падча� званка."
+msgid "Whether to play a sound when logging into a network."
+msgstr "Ці тр�ба агучваць злуч�нне з �еткай."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Паказваць балан� рахунку у �пі�е кантактаў"
+msgid "Play a sound when we log out"
+msgstr "�гучваць адлуч�нне ад �еткі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Паказваць аватары"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Ці тр�ба агучваць адлуч�нне ад �еткі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Паказваць �пі� кантактаў у пако�х"
+msgid "Enable popup notifications for new messages"
+msgstr "Ужываць выплыўны� апав�шч�нні дл� новых паведамленн�ў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Паказваць падказку пры закрыцці галоўнага акна"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+"Ці тр�ба паказваць выплыўны� апав�шч�нні пры атрыманні новага паведамленн�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Паказваць паза�еткавы� кантакты"
+msgid "Disable popup notifications when away"
+msgstr "�е паказваць выплыўны� апав�шч�нні ў р�жыме ад�утна�ці"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Паказваць інфармацыю аб пратаколе"
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Ці тр�ба паказваць выплыўны� апав�шч�нні ў р�жыме ад�утна�ці ці зан�та�ці."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Мовы дл� праверкі арфаграфіі"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Ужываць выплыўны� апав�шч�нні, калі чат не мае фоку�у"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Прадвызначана� папка дл� захаванн� атрыманых файлаў."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Ці тр�ба паказваць выплыўны� апав�шч�нні пры атрыманні новага паведамленн�, "
+"нават калі акно чату ўжо адкрыта, хоць і не мае фоку�у."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "�пошні каталог, з �кога была выбрана аватара."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Ужываць выплыўны� апав�шч�нні дл� ўваходу кантакта ў �етку"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Разм�шч�нне бакавога абшару ў акне чату"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Ці тр�ба паказваць выплыўны� апав�шч�нні пры ўваходзе кантакта ў �етку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Захаванае разм�шч�нне бакавога абшару ў акне чату (у пік�елах)."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ужываць выплыўны� апав�шч�нні дл� выхаду кантакта з �еткі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Матыў афармленн� размоў у вокнах чату."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Ці тр�ба паказваць выплыўны� апав�шч�нні пры выхадзе кантакта з �еткі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "�дмена матыва афармленн� размоў у вокнах чату."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "Ужываць графічны� �майлікі"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Ці тр�ба пераўтвараць �майлікі ў графічны� вы�вы ў т�к�це размоў."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "�гучваць апав�шч�нні"
+msgid "Show contact list in rooms"
+msgstr "Паказваць �пі� кантактаў у пако�х"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Ужываць матыў дл� пако�ў чату"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Ці тр�ба паказваць �пі� кантактаў у пако�х чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Ці можа Empathy паведамл�ць аб ме�цазнаходжанні кары�тальніка �го кантактам."
+msgid "Chat window theme"
+msgstr "Матыў акна чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Ці можа Empathy выкары�тоўваць GPS дл� вызнач�нн� ме�цазнаходжанн�."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Матыў афармленн� размоў у вокнах чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Ці можа Empathy выкары�тоўваць �отавую �етку дл� вызнач�нн� ме�цазнаходжанн�."
+msgid "Chat window theme variant"
+msgstr "�дмена матыва акна чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Ці можа Empathy выкары�тоўваць �етку дл� вызнач�нн� ме�цазнаходжанн�."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "�дмена матыва афармленн� размоў у вокнах чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Ці му�іць Empathy аўтаматычна злучацца з �еткамі пры запу�ку."
+msgid "Path of the Adium theme to use"
+msgstr "Сцежка да патр�бнага матыва Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Ці му�іць Empathy аўтаматычна пераходзіць у р�жым ад�утна�ці пры "
-"б�здзейна�ці кары�тальніка."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Сцежка да патр�бнага матыва Adium, калі дл� чату ўжыты матыў Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Ці му�іць Empathy пагаршаць дакладна�ць ме�цазнаходжанн� кары�тальніка дзел� "
-"абароны �го права на прыватна�ць."
+msgid "Enable WebKit Developer Tools"
+msgstr "Уключыць прылады ра�працоўшчыка WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Ці му�іць Empathy выкары�тоўваць аватару кантакта �к значок акна чату."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Ці тр�ба ўключыць прылады ра�працоўшчыка WebKit (напрыклад, Web Inspector)."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Inform other users when you are typing to them"
+msgstr ""
+"Паведамл�ць іншым кары�тальнікам аб тым, што вы пішаце дл� іх паведамленне"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Ці тр�ба выкары�тоўваць кіраўнікоў злуч�нн�ў дл� аўтаматычнага адлуч�нн�/"
-"перазлуч�нн�."
+"Ці тр�ба па�ылаць апав�шч�нні аб �тане чату тыпу \"пішу\" ці \"пера�таў "
+"пі�аць\". Пакуль што не ўплывае на �тан ад�утна�ці."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Ці тр�ба прав�раць арфаграфію напі�аных �лоў па �пі�е магчымых моў т�к�ту."
+msgid "Use theme for chat rooms"
+msgstr "Ужываць матыў дл� пако�ў чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Ці тр�ба пераўтвараць �майлікі ў графічны� вы�вы ў т�к�це размоў."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Ці тр�ба ўжываць г�ты матыў дл� пако�ў чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Ці тр�ба ўключыць фільтрацыю р�ха Pulseaudio."
+msgid "Spell checking languages"
+msgstr "Мовы дл� праверкі арфаграфіі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Ці тр�ба агучваць уваход кантактаў у �етку."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Спі� моў дл� праверкі арфаграфіі, падзеленых ко�камі (напрыклад, \"en, be, ru"
+"\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Ці тр�ба агучваць выхад кантактаў з �еткі."
+msgid "Enable spell checker"
+msgstr "Прав�раць арфаграфію"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Ці тр�ба агучваць падзеі."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Ці тр�ба прав�раць арфаграфію напі�аных �лоў па �пі�е магчымых моў т�к�ту."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Ці тр�ба агучваць уваходны� паведамленні."
+msgid "Nick completed character"
+msgstr "Знак па�л� дапоўненай м�нушкі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Ці тр�ба агучваць з'�ўленне новых размоў."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Знак, �кі тр�ба ў�таўл�ць па�л� м�нушкі пры �е дапаўненні клавішай Тab у "
+"групавым чаце."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Ці тр�ба агучваць выхадны� паведамленні."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy му�іць выкары�тоўваць аватару кантакта �к значок дл� акна чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Ці тр�ба агучваць злуч�нне з �еткай."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Ці му�іць Empathy выкары�тоўваць аватару кантакта �к значок акна чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Ці тр�ба агучваць адлуч�нне ад �еткі."
+msgid "Last account selected in Join Room dialog"
+msgstr "�пошні конт, выбраны ў ды�логу ўваходу ў пакой"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Ці тр�ба ўжываць гукавы� �ігналы ў р�жыме ад�утна�ці ці зан�та�ці."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"Сцежка аб'екта D-Bus, зв�занага з апошнім контам, абраным дл� ўваходу ў "
+"пакой."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Ці тр�ба паказваць выплыўны� апав�шч�нні пры выхадзе кантакта з �еткі."
+msgid "Camera device"
+msgstr "Пры�та�аванне від�акамеры"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"Ці тр�ба паказваць выплыўны� апав�шч�нні пры ўваходзе кантакта ў �етку."
+"Прадвызначанае пры�та�аванне від�акамеры дл� від�аразмоў, напрыклад \"/dev/"
+"video0\"."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Ці тр�ба паказваць выплыўны� апав�шч�нні пры атрыманні новага паведамленн�, "
-"нават калі акно чату ўжо адкрыта, хоць і не мае фоку�у."
+msgid "Camera position"
+msgstr "Разм�шч�нне від�акамеры"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr ""
-"Ці тр�ба паказваць выплыўны� апав�шч�нні пры атрыманні новага паведамленн�."
+msgid "Position the camera preview should be during a call."
+msgstr "Разм�шч�нне карцінкі з від�акамеры падча� званка."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Ці тр�ба паказваць балан� контаў у �пі�е кантактаў."
+msgid "Echo cancellation support"
+msgstr "Падтрымка фільтрацыі р�ха"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Ці тр�ба паказваць аватары ў �пі�е кантактаў і вокнах чату."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Ці тр�ба ўключыць фільтрацыю р�ха Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Ці тр�ба паказваць паза�еткавы� кантакты ў �пі�е кантактаў."
+msgid "Show hint about closing the main window"
+msgstr "Паказваць падказку пры закрыцці галоўнага акна"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Ці тр�ба паказваць выплыўны� апав�шч�нні ў р�жыме ад�утна�ці ці зан�та�ці."
+"Ці тр�ба паказваць ды�логавае акенца пры закрыцці галоўнага акна з дапамогай "
+"кнопкі \"x\" у загалоўнай �тужцы."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Ці тр�ба паказваць інфармацыю аб пратаколе ў �пі�е кантактаў."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy можа публікаваць ме�цазнаходжанне кары�тальніка"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Ці тр�ба паказваць �пі� кантактаў у пако�х чату."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr ""
+"Ці можа Empathy паведамл�ць аб ме�цазнаходжанні кары�тальніка �го кантактам."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Ці тр�ба паказваць �пі� кантактаў у кампактным р�жыме."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy можа выкары�тоўваць �етку дл� вызнач�нн� ме�цазнаходжанн�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Ці тр�ба паказваць ды�логавае акенца пры закрыцці галоўнага акна з дапамогай "
-"кнопкі \"x\" у загалоўнай �тужцы."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Ці можа Empathy выкары�тоўваць �етку дл� вызнач�нн� ме�цазнаходжанн�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Ці тр�ба ўжываць г�ты матыў дл� пако�ў чату."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+"Empathy можа выкары�тоўваць �отавую �етку дл� вызнач�нн� ме�цазнаходжанн�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
-"Крыт�рый �артаванн� �пі�а кантактаў. Прадвызначаны� паводзіны - �артаваць "
-"паводле імёнаў кантактаў - уключаюцца знач�ннем \"name\". Знач�нне \"state\" "
-"уключыць �артаванне паводле �тану кантактаў."
+"Ці можа Empathy выкары�тоўваць �отавую �етку дл� вызнач�нн� ме�цазнаходжанн�."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Кіраванне контамі камунікатара і VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy можа выкары�тоўваць GPS дл� вызнач�нн� ме�цазнаходжанн�"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Конты камунікатара і VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Ці можа Empathy выкары�тоўваць GPS дл� вызнач�нн� ме�цазнаходжанн�."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy му�іць пагаршаць дакладна�ць ме�цазнаходжанн�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Ці му�іць Empathy пагаршаць дакладна�ць ме�цазнаходжанн� кары�тальніка дзел� "
+"абароны �го права на прыватна�ць."
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -521,7 +542,7 @@ msgstr "Памылка пры �пробе перадачы файла"
 msgid "The other participant is unable to transfer the file"
 msgstr "Суразмоўца не здолеў ажыцц�віць перадачу файла"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "�ев�дома� прычына"
 
@@ -557,137 +578,137 @@ msgstr "Званок да %s"
 msgid "Call from %s"
 msgstr "Званок ад %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Да�тупны"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Зан�ты"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "�д�утны"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "��бачны"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Па-за �еткай"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�ев�дома"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Прычына не азначана"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Уключаны р�жым па-за �еткай"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
+#: ../libempathy/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:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "��ўдала� ід�нтыфікацы�"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Памылка шыфраванн�"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Ім� ўжо зан�та"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Сертыфікат не пададзены"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертыфікат не за�лугоўвае даверу"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертыфікат �а�тар�ў"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертыфікат не актывізаваны"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "�азва камп'ютара ў �ертыфікаце не адпав�дае патр�бнай"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "�дбітак �ертыфіката не адпав�дае патр�бнаму"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Сертыфікат ула�наручна падпі�аны"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Памылка �ертыфіката"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Шыфраванне неда�тупнае"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Хібны �ертыфікат"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "�дмоўлена ў злуч�нні"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "�е ўдало�� ў�тал�ваць злуч�нне"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Злуч�нне �трачана"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Г�ты р��ур� ужо злучаны з �ерверам"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Г�ты конт ужо злучаны з �ерверам"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Злуч�нне заменена новым дл� таго ж �амага р��ур�у"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Такі конт ужо і�нуе на �ерверы"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Сервер надта зан�ты і не можа аб�лужыць г�та злуч�нне"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертыфікат быў адкліканы"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Дл� �ертыфіката выкары�таны �лабы або неб��печны алгарытм шыфраванн�"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -695,27 +716,31 @@ msgstr ""
 "Даўжын� �ертыфіката �ервера або глыбін� �го ланцуга перавышае абмежаванне, "
 "вы�таўленае крыптаграфічнай біблі�т�кай"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Ваша апраграмаванне надта �тарое"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Унутрана� памылка"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Людзі паблізу"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Японі�"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -723,7 +748,7 @@ msgstr[0] "%d �екунда таму"
 msgstr[1] "%d �екунды таму"
 msgstr[2] "%d �екунд таму"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -731,7 +756,7 @@ msgstr[0] "%d хвіліна таму"
 msgstr[1] "%d хвіліны таму"
 msgstr[2] "%d хвілін таму"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -739,7 +764,7 @@ msgstr[0] "%d гадзіна таму"
 msgstr[1] "%d гадзіны таму"
 msgstr[2] "%d гадзін таму"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -747,7 +772,7 @@ msgstr[0] "%d дзень таму"
 msgstr[1] "%d дні таму"
 msgstr[2] "%d дзён таму"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -755,7 +780,7 @@ msgstr[0] "%d тыдзень таму"
 msgstr[1] "%d тыдні таму"
 msgstr[2] "%d тыдн�ў таму"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -763,16 +788,16 @@ msgstr[0] "%d ме��ц таму"
 msgstr[1] "%d ме��цы таму"
 msgstr[2] "%d ме��цаў таму"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "у будучыні"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "У�е конты"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Конт"
 
@@ -790,30 +815,30 @@ msgstr "Сервер"
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Ім� кары�тальніка:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "У_жыць"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Увай�ці"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Такі конт ужо і�нуе на г�тым �ерверы"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Стварыць новы конт на г�тым �ерверы"
 
@@ -822,137 +847,137 @@ msgstr "Стварыць новы конт на г�тым �ерверы"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Конт %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "�овы конт"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Прыклад:</b> МаёКантактнаеІм�"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Пароль:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "�дмы�ловае"
+msgid "Screen _Name:"
+msgstr "_Кантактнае ім�:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Прыклад:</b> МаёКантактнаеІм�"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Пароль:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запомніць пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запомніць пароль"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Порт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Запомніць пароль"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Кантактнае ім�:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Ваш пароль да конта AIM"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "�дмы�ловае"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Ваша кантактнае ім� дл� конта AIM"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "What is your AIM password?"
+msgstr "Ваш пароль да конта AIM"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Прыклад:</b> ім�_кары�тальніка"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запомніць пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "Ід_�нтыфікатар конта:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Прыклад:</b> ім�_кары�тальніка"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Ваш ід�нтыфікатар кары�тальніка да конта GroupWise"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Ваш пароль да конта GroupWise"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ-ід_�нтыфікатар:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Прыклад:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Знаказбор:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ-ід_�нтыфікатар:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Ваш ід�нтыфікатар да конта ICQ"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Ваш пароль да конта ICQ"
 
@@ -989,11 +1014,23 @@ msgstr "Options"
 msgid "None"
 msgstr "�ічога"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Сетка"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Сетка:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Знаказбор:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Серверы"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1001,14 +1038,6 @@ msgstr ""
 "Больша�ць IRC-�ервераў не патрабуе парол�ў, таму калі вы не ўп�ўнены, про�та "
 "пакіньце графу парол� пу�той."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Сетка"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Сетка:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "М�нушка:"
@@ -1025,48 +1054,20 @@ msgstr "Развітальнае паведамленне:"
 msgid "Real name:"
 msgstr "Сапраўднае ім�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Серверы"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Ваша м�нушка ў IRC-�етцы"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "IRC-�етка"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Прыклад:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Прыклад:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_�бав�зковае шыфраванне (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "І_гнараваць памылкі SSL-�ертыфіката"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "За�ланіць на�тройкі �ервера ўла�нымі"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "_Пры�рыт�т:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Ваша м�нушка ў IRC-�етцы"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Р��ур�:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Ваша ім� кары�тальніка ў �етцы Facebook"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1079,179 +1080,203 @@ msgstr ""
 "Каб выбраць �абе ім�, наведайце <a href=\"http://www.facebook.com/username/"
 "\">г�ту �таронку</a>."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "_Выкары�тоўваць �тары SSL-пратакол"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Ваш пароль да конта Facebook"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Ваша ім� кары�тальніка ў �етцы Facebook"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Ваш ід�нтыфікатар Google"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Прыклад:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Ваш пароль да конта Google"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Прыклад:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "І_гнараваць памылкі SSL-�ертыфіката"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_Пры�рыт�т:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Р��ур�:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_�бав�зковае шыфраванне (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "_Выкары�тоўваць �тары SSL-пратакол"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "За�ланіць на�тройкі �ервера ўла�нымі"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Ваш ід�нтыфікатар Jabber"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Ваш пароль да конта Jabber"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Пажаданы ід�нтыфікатар Jabber"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Ваш пароль да конта Jabber"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Ваш пароль да пажаданага конта Jabber"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Прыклад:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Ваш ід�нтыфікатар Windows Live"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Ваш пароль да конта Windows Live"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "_Электронны паштовы адра�:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_М�нушка:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Прозвішча:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "Ім_�:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_�публікаванае ім�:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Jabber-ід_�нтыфікатар:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Прозвішча:"
+msgid "E-_mail address:"
+msgstr "_Электронны паштовы адра�:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_�публікаванае ім�:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "Ім� _кары�тальніка:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Прыклад:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Ім� дл� ід�нтыфікацыі кары�тальніка:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Пошук �ув�зі"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "�ўтаматычны пошук STUN-�ервера"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Выкары�тоўваць г�ты конт дл� званкоў на _хатні� і мабільны� т�лефоны"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ігнараваць памылкі TLS-пратакола"
+msgid "NAT Traversal Options"
+msgstr "Опцыі праходу праз NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Прамежак ча�у (у �екундах)"
+msgid "Proxy Options"
+msgstr "Опцыі прок�і-�ервера"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Опцыі падтрымкі �ув�зі"
+msgid "Miscellaneous Options"
+msgstr "Разна�тайны� опцыі"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Вольна� маршрутызацы�"
+msgid "STUN Server:"
+msgstr "STUN-�ервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механізм:"
+msgid "Discover the STUN server automatically"
+msgstr "�ўтаматычны пошук STUN-�ервера"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Разна�тайны� опцыі"
+msgid "Discover Binding"
+msgstr "Пошук �ув�зі"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Опцыі праходу праз NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Опцыі падтрымкі �ув�зі"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механізм:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Опцыі прок�і-�ервера"
+msgid "Interval (seconds)"
+msgstr "Прамежак ча�у (у �екундах)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Ім� дл� ід�нтыфікацыі кары�тальніка:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Тран�парт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN-�ервер:"
+msgid "Loose Routing"
+msgstr "Вольна� маршрутызацы�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Сервер:"
+msgid "Ignore TLS Errors"
+msgstr "Ігнараваць памылкі TLS-пратакола"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Тран�парт:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Выкары�тоўваць г�ты конт дл� званкоў на _хатні� і мабільны� т�лефоны"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Ваш пароль да конта SIP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Ваш ід�нтыфікатар да конта SIP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "Ім� _кары�тальніка:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Ваш пароль да конта SIP"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo!-ід_�нтыфікатар:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "І_гнараваць запраш�нні на канфер�нцыі і ў пакоі чату"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_�а�тройкі м��цова�ці дл� �пі�а пако�ў:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Ваш ід�нтыфікатар да конта Yahoo!"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Ваш пароль да конта Yahoo!"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo!-ід_�нтыфікатар:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_�а�тройкі м��цова�ці дл� �пі�а пако�ў:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1314,40 +1339,40 @@ msgstr "Г�ты пратакол не падтрымлівае �к�транн
 msgid "You don't have enough credit in order to place this call"
 msgstr "Вам не �тае грошай, каб перанакіраваць г�ты званок"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "�е ўдало�� ра�пачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Г�та� размова не падтрымлівае т�мы"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Вы не маеце дазволу на зм�ненне т�мы размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" не з'�ўл�ецца прыдатным ід�нтыфікатарам кантакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ачы�ціць у�е паведамленні ў адкрытым акне размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <т�ма>: прызначыць т�му дл� актыўнай размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ід�нтыфікатар пако�>: далучыцца да групавога чату ў пакоі"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ід�нтыфікатар пако�>: далучыцца да групавога чату ў пакоі"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1355,24 +1380,24 @@ msgstr ""
 "/part [<ід�нтыфікатар пако�>] [<прычына>]: пакінуць групавы чат, звычайна "
 "актыўны"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <кантакт> [<паведамленне>]: ра�пачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <кантакт> <паведамленне>: ра�пачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <м�нушка>: зм�ніць �ваю м�нушку на актыўным �ерверы"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <паведамленне>: па�лаць ACTION-паведамленне ў адкрытае акно размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1383,11 +1408,11 @@ msgstr ""
 "\". �апрыклад: \"/say /join выкары�тоўваецца дл� далуч�нн� да новага "
 "групавога чату ў пакоі\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <кантакт>: паказаць інфармацыю аб кантакце"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1395,122 +1420,128 @@ msgstr ""
 "/help [<загад>]: паказаць у�е в�домы� загады. Калі пададзены <загад>, "
 "паказаць правілы �го выкары�танн�."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Правілы кары�танн�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "�ев�домы загад"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "�ев�домы загад. Каб пагл�дзець �пі� у�іх в�домых загадаў, выканайце /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "не �тае грошай дл� па�ылкі паведамленн�"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Памылка па�ылкі паведамленн� \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Памылка па�ылкі паведамленн�: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "не �тае грошай дл� па�ылкі паведамленн�. <a href='%s'>Папоўніце рахунак</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "не падтрымліваецца"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "па-за �еткай"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "хібны кантакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "адмоўлена ў дазволе"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "надта доўгае паведамленне"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "не р�алізавана"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "нев�дома"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Т�ма:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Т�ма вызначана �к: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Т�ма вызначана кантактам %s �к: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Т�ма не вызначана"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(н�ма прапаноў)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Дадаць \"%s\" у �лоўнік"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Дадаць \"%s\" у �лоўнік (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "У�тавіць �майлік"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Па�лаць"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "Прапанаваны� _вары�нты выпраўленн�"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "�е ўдало�� атрымаць �вежы� журналы"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "Удзельнік %s ц�пер па-за �еткай"
@@ -1518,12 +1549,12 @@ msgstr "Удзельнік %s ц�пер па-за �еткай"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "Удзельнік %2$s выпхнуў удзельніка %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "Удзельніка %s выпхнулі з пако�"
@@ -1531,17 +1562,17 @@ msgstr "Удзельніка %s выпхнулі з пако�"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "Удзельнік %2$s забаніў удзельніка %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "Удзельніка %s забанілі"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "Удзельнік %s пакінуў пакой"
@@ -1551,17 +1582,17 @@ msgstr "Удзельнік %s пакінуў пакой"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "Удзельнік %s увайшоў у пакой"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Удзельнік %s ц�пер называецца %s"
@@ -1569,55 +1600,55 @@ msgstr "Удзельнік %s ц�пер называецца %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../libempathy-gtk/empathy-chat.c:2993
 #: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "�длучаны"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Ці вы хочаце захаваць г�ты пароль?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Запомніць"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "�е зараз"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Паўтарыць"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Хібны пароль. Паўтарыце �пробу:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Г�ты пакой абаронены паролем:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Далучыцца"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Злучаны"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Размова"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1649,10 +1680,10 @@ msgstr "РÑ�дагаванне Ñ�піÑ�а блакіраваных кантакÑ
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 #: ../libempathy-gtk/empathy-individual-widget.c:1474
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Конт:"
 
@@ -1662,7 +1693,7 @@ msgstr "Блакіраваны� кантакты"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Выдаліць"
@@ -1685,34 +1716,30 @@ msgstr "_�дкрыць �па�ылку"
 msgid "%A %B %d %Y"
 msgstr "%A, %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "��абі�ты� зве�ткі"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "�овы кантакт"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Блакіраваць %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Ці вы �апраўды хочаце блакіраваць \"%s\" у магчыма�ці кантактаванн� з вамі?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Блакіраваць"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1721,17 +1748,17 @@ msgstr[1] "_Па�кардзіцца на г�ты� кантакты"
 msgstr[2] "_Па�кардзіцца на г�ты� кантакты"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "_Вырашыць пазней"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Запыт на падпі�ку"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Блакіраваць кары�тальніка"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "_Вырашыць пазней"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1886,7 +1913,7 @@ msgstr "Вышын�:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Ме�цазнаходжанне"
 
@@ -1912,6 +1939,16 @@ msgstr "Захаваць аватару"
 msgid "Unable to save avatar"
 msgstr "�е ўдало�� захаваць аватару"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "��абі�ты� падраб�зна�ці"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Падраб�зна�ці аб кантакце"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Поўнае ім�"
@@ -1977,54 +2014,49 @@ msgstr "дл� пошты"
 msgid "parcel"
 msgstr "дл� па�ылак"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Ме�цазнаходжанне</b> (дата)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Ід�нтыфікатар:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 #: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "П�еўданім:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Зве�ткі аб кліенце"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Кліент:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Ме�цазнаходжанне</b> (дата)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Падраб�зна�ці аб кантакце"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Вы�ланы запыт зве�так..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "Ід�нтыфікатар:"
+msgid "Client Information"
+msgstr "Зве�ткі аб кліенце"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Вы�ланы запыт зве�так..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "�С:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Вер�і�:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Кліент:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Групы"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2032,17 +2064,17 @@ msgstr ""
 "Вызначыце групы дл� г�тага кантакта. Заўважце, што можна не выбіраць ні "
 "адной групы або выбраць адразу некалькі."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Дадаць групу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Выбар"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1949
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Група"
 
@@ -2064,156 +2096,141 @@ msgstr[2] "Ð�аÑ�тупныÑ� ідÑ�нтычнаÑ�ці не могуць быцÑ
 msgid "Edit Contact Information"
 msgstr "Р�дагаванне кантактных зве�так"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Зв�заны� кантакты"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Вызначыце кантакты дл� �ув�зі"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Пап�р�дні агл�д новага кантакта"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Кантакты, вылучаны� ў левым �пі�е, будуць аб'�днаны� ў адно."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Выберыце конт дл� перанакіраванн� званка"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Званок"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мабільны т�лефон"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Працоўны т�лефон"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Хатні т�лефон"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Блакіраваць кантакт"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Чат"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "П_а�лаць SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_�ўды�званок"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Від�азванок"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "_Пап�р�дні� размовы"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Па�лаць файл"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Падз�ліцца до�тупам да �тала"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Упадабаны"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts не ў�тал�ваны"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"У�талюйце gnome-contacts, каб атрымаць до�туп да падраб�зна�ц�ў кантактаў."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "_Зве�ткі"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Р�дагаваць"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_�б'�днаць кантакты..."
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Запрашаю ва� у г�ты пакой"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Запра�іць у пакой групавога чату"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-main-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Дадаць кантакт..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Выдаліць і _блакіраваць"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ці вы �апраўды хочаце выдаліць групу \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Выдаленне групы"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "_Выдаліць"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ці вы �апраўды хочаце выдаліць кантакт \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2222,7 +2239,7 @@ msgstr ""
 "Ці вы �апраўды хочаце выдаліць аб'�днальны кантакт \"%s\"? Г�та аперацы� "
 "так�ама выдаліць �го �кладовы� кантакты."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Выдаленне кантакта"
 
@@ -2238,23 +2255,23 @@ msgstr[2] "�б'�днальны кантакт дл� %u кантактаў"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Ме�цазнаходжанне</b> (дата)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "У �етцы, з т�лефона або мабільнага пры�та�аванн�"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "�ова� �етка"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Выберыце IRC-�етку"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_�нул�ваць змены ў �пі�е �етак"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Выбраць"
@@ -2267,49 +2284,6 @@ msgstr "новы �ервер"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "�б'�днанне кантактаў"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Раз'�днаць..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Цалкам раздз�ліць аб'�днаны� кантакты."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_�б'�днаць"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Раз'�днаць аб'�днаны� кантакты \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Ці вы �апраўды хочаце раз'�днаць аб'�днаны� кантакты? Г�та прыв�дзе да іх "
-"поўнага падзелу."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Раз'�днаць"
-
 #: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Журнал"
@@ -2412,7 +2386,7 @@ msgid "Text chats"
 msgstr "Т�к�тавы� чаты"
 
 #: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Званкі"
 
@@ -2445,42 +2419,42 @@ msgid "Delete from:"
 msgstr "Выдаліць дл�:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Загрузка...</span>"
+msgid "_File"
+msgstr "_Файл"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Чат"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Праўка"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Выдаліць у�е журналы размоў..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Профіль"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Від�а"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Чат"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Праўка"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Від�а"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Файл"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "�таронка 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Загрузка...</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Г�ты кантакт па-за �еткай"
@@ -2613,20 +2587,20 @@ msgid "Find:"
 msgstr "Шукаць:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Улічваць р�гі�тр літар"
+msgid "_Previous"
+msgstr "�а_зад"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Выраз не знойдзены"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_�аперад"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Улічваць р�гі�тр літар"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "�а_зад"
+msgid "Phrase not found"
+msgstr "Выраз не знойдзены"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2672,12 +2646,12 @@ msgstr "Гала�авы званок �кончаны"
 msgid "Edit Custom Messages"
 msgstr "Р�дагаванне ўла�ных паведамленн�ў"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Паведамленне зменена ў %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Звычайны"
 
@@ -2754,34 +2728,38 @@ msgid "Certificate hostname: %s"
 msgstr "�азва камп'ютара з �ертыфіката: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Прац�гнуць"
+msgid "C_ontinue"
+msgstr "_Прац�гнуць"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "�е вартае даверу злуч�нне"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Г�та злуч�нне не вартае даверу. У�ё роўна прац�гнуць прац�дуру?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запомніць г�ты выбар дл� на�тупных злуч�нн�ў"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Падраб�зна�ці аб �ертыфікаце"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "�е ўдало�� адкрыць URI-адра�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Выбар файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "�е �тае вольнай пра�торы дл� захаванн� файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2790,7 +2768,7 @@ msgstr ""
 "Каб захаваць г�ты файл, патр�бна %s вольнай пра�торы, а да�тупна толькі %s. "
 "Выберыце іншае ме�ца дл� файла."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Уваходны файл ад %s"
@@ -3041,233 +3019,73 @@ msgstr ""
 "insomnia <defragbrain@gmail.com>\n"
 "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Падча� імпартаванн� контаў узнікла памылка."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Падча� разбору падраб�зна�ц�ў аб конце ўзнікла памылка."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Падча� �твар�нн� конта ўзнікла памылка."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Узнікла памылка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "�пі�анне памылкі: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Вы можаце альбо в�рнуцца назад і паўтарыць увод падраб�зна�ц�ў аб вашых "
-"контах, альбо закрыць г�тага памочніка і дадаць конты пазней з дапамогай "
-"меню Праўка."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Узнікла памылка"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Тып вашага конта дл� чату"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Ці вы маеце іншы� конты дл� чату, �кі� б вы так�ама хацелі на�троіць?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Падайце падраб�зны� зве�ткі аб вашым конце"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Тып новага конта дл� чату"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Ці тр�ба �тварыць іншы� конты дл� чату?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Падайце падраб�зны� зве�ткі аб новым конце"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"З дапамогай Empathy вы можаце гутарыць з іншымі людзьмі паблізу, а так�ама з "
-"��брамі і калегамі, �кі� кары�таюцца Google Talk, AIM, Windows Live і іншымі "
-"праграмамі дл� чату. Калі вы маеце мікрафон ці �еціўную від�акамеру, так�ама "
-"можна рабіць аўды�- і від�азванкі."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Ці вы маеце конт, �кім ужо кары�талі�� ў іншай праграме дл� чату?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Так, тр�ба імпартаваць на�тройкі конта з "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Так, � падам на�тройкі конта"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "�е, мне патр�бны новы конт"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "�е, пакуль што � толькі хачу ўбачыць людзей паблізу м�не"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Вызначыце конты дл� імпартаванн�:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Так"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "�е, пакуль што ў�ё"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy умее аўтаматычна вышукваць і арганізоўваць чат з людзьмі, �кі� "
-"кары�таюцца вашай �еткай. Калі вы хочаце выкары�таць г�ту магчыма�ць, "
-"праверце правільна�ць на�троек, змешчаных ніж�й. Пазней можна будзе зм�ніць "
-"г�ты� на�тройкі або наогул выключыць г�ту функцыю ў ды�логавым акенцы \"Конты"
-"\"."
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Праўка->Конты"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "Пакуль не _тр�ба ўключаць г�ту функцыю"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Вы не зможаце браць удзел у чатах з людзьмі, �кі� кары�таюцца вашай �еткай, "
-"бо telepathy-salut не ў�тал�ваны. Калі вы хочаце ўключыць г�ту функцыю, "
-"у�талюйце пакунак \"telepathy-salut\" і �тварыце конт \"Людзі паблізу\" у "
-"акенцы \"Конты\"."
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut не ў�тал�ваны"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Памочнік на�тройкі контаў дл� чату і VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Вітаем у Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Імпартаванне на�ўных контаў"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Запоўніце анкету з а�абі�тымі зве�ткамі"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:71
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Ваш конт %s мае незахаваны� змены."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:75
 msgid "Your new account has not been saved yet."
 msgstr "Ваш новы конт �шч� не захаваны."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:347
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Злуч�нне..."
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "Па-за �еткай - %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "�длучаны - %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "Па-за �еткай - ��ма �еткавага злуч�нн�"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "�ев�домы �тан"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
 msgstr "Па-за �еткай - Конт выключаны"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:533
 msgid "Edit Connection Parameters"
 msgstr "Зм�ненне параметраў злуч�нн�"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:696
 msgid "Failed to retrieve your personal information from the server."
 msgstr "�е ўдало�� атрымаць а�абі�ты� зве�ткі з �ервера."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:702
 msgid "Go online to edit your personal information."
 msgstr "Злучыце�� з �еткай, каб змагчы р�дагаваць а�абі�ты� зве�ткі."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:787
 msgid "_Edit Connection Parameters..."
 msgstr "_Зм�ніць параметры злуч�нн�..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1283
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ці вы �апраўды хочаце выдаліць %s �а �вайго камп'ютара?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1287
 msgid "This will not remove your account on the server."
 msgstr "Г�тае дзе�нне не выдаліць ваш конт на �ерверы."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3276,15 +3094,23 @@ msgstr ""
 "вашых змен. Ці вы �апраўды хочаце прац�гнуць прац�дуру?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "_Уключыць"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "_Выключыць"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Прапу�ціць"
+
+#: ../src/empathy-accounts-dialog.c:2087
+msgid "_Connect"
+msgstr "_Злучыць"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3296,19 +3122,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Дадаць..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Загрузка зве�так аб конце"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Модулі дл� працы з пратаколамі не ў�тал�ваны�"
+msgid "_Import…"
+msgstr "І_мпартаваць..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Пратакол:"
+msgid "Loading account information"
+msgstr "Загрузка зве�так аб конце"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3316,9 +3138,9 @@ msgstr ""
 "Каб дадаць новы конт, �пачатку тр�ба ў�тал�ваць модуль падтрымкі адпаведнага "
 "пратакола."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "І_мпартаваць..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Модулі дл� працы з пратаколамі не ў�тал�ваны�"
 
 #: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
@@ -3328,15 +3150,11 @@ msgstr "- ід�нтыфікацыйны кліент Empathy"
 msgid "Empathy authentication client"
 msgstr "Ід�нтыфікацыйны кліент Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Людзі паблізу"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr "- �ўды�- і від�акліент Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "�ўды�- і від�акліент Empathy"
 
@@ -3379,33 +3197,33 @@ msgstr "Падраб�зна�ці"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Званок: %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "IP-адра�, �кі бачыць машына"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-адра�, �кі бачыць �ервер у інт�рн�це"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-адра� �уразмоўцы, бачны з іншага боку злуч�нн�"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "IP-адра� р�тран�л�тарнага �ервера"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "IP-адра� мультыка�т-групы"
 
@@ -3424,12 +3242,12 @@ msgid "Connected — %d:%02dm"
 msgstr "Прац�гла�ць злуч�нн� - %d:%02d хв"
 
 #: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Т�хнічны� падраб�зна�ці"
 
 #: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3439,7 +3257,7 @@ msgstr ""
 "�кі� падтрымлівае ваш камп'ютар"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3449,7 +3267,7 @@ msgstr ""
 "�кі� падтрымлівае ваш камп'ютар"
 
 #: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3459,12 +3277,12 @@ msgstr ""
 "�еткі, �ка� не дазвал�е непа�р�днае злуч�нне."
 
 #: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "У �етцы ўзнікла памылка"
 
 #: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-call-window.c:3100
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3472,7 +3290,7 @@ msgstr ""
 "не ў�тал�вана на г�тым камп'ютары"
 
 #: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-call-window.c:3103
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3480,7 +3298,7 @@ msgstr ""
 "не ў�тал�вана на г�тым камп'ютары"
 
 #: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3492,160 +3310,212 @@ msgstr ""
 "акенца \"�дладка\" ў меню \"Дапамога\"."
 
 #: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "У рухавіку званкоў узнікла памылка"
 
 #: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "Да��гнуты канец �трумен�"
 
 #: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "�е ўдало�� ра�пачаць аўды��трумен�ванне"
 
 #: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "�е ўдало�� ра�пачаць від�а�трумен�ванне"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "�ўды�"
+msgid "_Call"
+msgstr "_Званок"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Д�кадавальны код�к:"
+msgid "_Microphone"
+msgstr "_Мікрафон"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Выключыць від�акамеру"
+msgid "_Camera"
+msgstr "_Камера"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Паказаць пан�ль набору"
+msgid "_Settings"
+msgstr "_�а�тройкі"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кадавальны код�к:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Від"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Паве�іць трубку"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Дапамога"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Закончыць г�ту размову"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Зме�т"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "М��цовы кандыдат:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "�д_ладка"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Разгарнуць м�не"
+msgid "Swap camera"
+msgstr "Пам�н�ць камеру"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Згарнуць м�не"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "�ддалены кандыдат:"
+msgid "Maximise me"
+msgstr "Разгарнуць м�не"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Па�ылаць аўды��ігнал"
+msgid "Disable camera"
+msgstr "Выключыць від�акамеру"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Па�ылаць від�а�ігнал"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Паве�іць трубку"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Паказаць пан�ль набору"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Закончыць г�ту размову"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Від�азванок"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Ра�пачаць від�азванок"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Ра�пачаць аўды�званок"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Пам�н�ць камеру"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Пераключыць перадачу аўды��ігналу"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Пераключыць перадачу від�а�ігналу"
+msgid "Show dialpad"
+msgstr "Паказаць пан�ль набору"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "�ев�дома"
+msgid "Display the dialpad"
+msgstr "Паказаць пан�ль набору"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Па�ылаць від�а�ігнал"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Від�азванок"
+msgid "Toggle video transmission"
+msgstr "Пераключыць перадачу від�а�ігналу"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Званок"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Па�ылаць аўды��ігнал"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Камера"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Зме�т"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Пераключыць перадачу аўды��ігналу"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "�д_ладка"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Кадавальны код�к:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Дапамога"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
+msgid "Unknown"
+msgstr "�ев�дома"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Д�кадавальны код�к:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Мікрафон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "�ддалены кандыдат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_�а�тройкі"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "М��цовы кандыдат:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Від"
+msgid "Audio"
+msgstr "�ўды�"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Закрыць г�та акно?"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Закрыўшы г�та акно, вы выйдзеце з %s. Вы больш не будзеце атрымліваць новых "
+"паведамленн�ў да паўторнага ўваходу."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Закрыўшы г�та акно, вы выйдзеце з %u пако�. Вы больш не будзеце атрымліваць "
+"новых паведамленн�ў да паўторнага ўваходу."
+msgstr[1] ""
+"Закрыўшы г�та акно, вы выйдзеце з %u пако�ў. Вы больш не будзеце атрымліваць "
+"новых паведамленн�ў да паўторнага ўваходу."
+msgstr[2] ""
+"Закрыўшы г�та акно, вы выйдзеце з %u пако�ў. Вы больш не будзеце атрымліваць "
+"новых паведамленн�ў да паўторнага ўваходу."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Вый�ці з %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Вы больш не будзеце атрымліваць новых паведамленн�ў з г�тага пако� да "
+"паўторнага ўваходу."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Закрыць акно"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Вый�ці з пако�"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3653,7 +3523,7 @@ msgstr[0] "%s (%d непрачытана)"
 msgstr[1] "%s (%d непрачытана)"
 msgstr[2] "%s (%d непрачытана)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3661,7 +3531,7 @@ msgstr[0] "%s (і �шч� %u размова)"
 msgstr[1] "%s (і �шч� %u размовы)"
 msgstr[2] "%s (і �шч� %u размоў)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3669,7 +3539,7 @@ msgstr[0] "%s (%d непрачытанае паведамленне ад іншÑ
 msgstr[1] "%s (%d непрачытаны� паведамленні ад іншых)"
 msgstr[2] "%s (%d непрачытаных паведамленн�ў ад іншых)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3677,11 +3547,11 @@ msgstr[0] "%s (%d непрачытанае паведамленне ад уÑ�Ñ–Ñ
 msgstr[1] "%s (%d непрачытаны� паведамленні ад у�іх)"
 msgstr[2] "%s (%d непрачытаных паведамленн�ў ад у�іх)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3689,69 +3559,69 @@ msgstr[0] "Па�ылка %d паведамленн�"
 msgstr[1] "Па�ылка %d паведамленн�ў"
 msgstr[2] "Па�ылка %d паведамленн�ў"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Піша паведамленне."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_�чы�ціць"
+msgid "_Conversation"
+msgstr "_Размова"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Кантакт"
+msgid "C_lear"
+msgstr "_�чы�ціць"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "_У�тавіць �майлік"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Упадабаны пакой дл� групавога чату"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "_Запра�іць удзельнікаў..."
+msgid "Notify for All Messages"
+msgstr "�пав�шчаць аб у�іх паведамленн�х"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Па�унуць картку ў_лева"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Паказаць �пі� кантактаў"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Па�унуць картку ў_права"
+msgid "Invite _Participant…"
+msgstr "_Запра�іць удзельнікаў..."
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "�пав�шчаць аб у�іх паведамленн�х"
+msgid "C_ontact"
+msgstr "_Кантакт"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Размова"
+msgid "_Tabs"
+msgstr "_Карткі"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_�дчапіць картку"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Упадабаны пакой дл� групавога чату"
+msgid "_Previous Tab"
+msgstr "Да _пап�р�дн�й карткі"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "Да _на�тупнай карткі"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "Да _пап�р�дн�й карткі"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_В�рнуць закрытую картку"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Паказаць �пі� кантактаў"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Па�унуць картку ў_лева"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Карткі"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Па�унуць картку ў_права"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_В�рнуць закрытую картку"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_�дчапіць картку"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3765,7 +3635,7 @@ msgstr "Пакой"
 msgid "Auto-Connect"
 msgstr "�ўтаматычнае злуч�нне"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Кіраванне �пі�ам упадабаных пако�ў дл� групавога чату"
 
@@ -3773,7 +3643,7 @@ msgstr "Кіраванне �пі�ам упадабаных пако�ў дл�
 msgid "Incoming video call"
 msgstr "Уваходны від�азванок"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "Уваходны званок"
 
@@ -3788,7 +3658,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s·про�іць размовы. �дкажаце?"
 
 #: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Уваходны званок ад %s"
@@ -3806,7 +3676,7 @@ msgid "_Answer with video"
 msgstr "_�дказаць з від�а"
 
 #: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Уваходны від�азванок ад %s"
@@ -3830,7 +3700,7 @@ msgid "_Decline"
 msgstr "_�дмовіцца"
 
 #: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Прын�ць запраш�нне"
 
@@ -3849,7 +3719,7 @@ msgstr "Ва� запра�ілі ў %s"
 msgid "Incoming file transfer from %s"
 msgstr "Уваходны файл ад %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Патр�бны пароль"
 
@@ -3979,7 +3849,11 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Вычы�ціць закончаны�, �ка�аваны� і н�ўдалы� перадачы файлаў з г�тага �пі�а"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "І_мпартаваць"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3987,170 +3861,185 @@ msgstr ""
 "�е ўдало�� адшукаць конты дл� імпартаванн�. Empathy пакуль падтрымлівае "
 "імпартаванне толькі дл� праграмы Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Імпартаванне контаў"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Імпартаванне"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Пратакол"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Крыніца"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Падаць пароль"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "�длучыцца"
 
-#: ../src/empathy-main-window.c:635
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Каб убачыць кантакты, тр�ба на�троіць конт."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "�дпаведнікаў не знойдзена"
 
-#: ../src/empathy-main-window.c:743
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "�а жаль, пакуль вы не абновіце апраграмаванне %2$s, немагчыма будзе "
 "кары�тацца контамі %1$s."
 
-#: ../src/empathy-main-window.c:811
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "�бнавіць апраграмаванне..."
 
-#: ../src/empathy-main-window.c:817 ../src/empathy-main-window.c:938
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Закрыць"
 
-#: ../src/empathy-main-window.c:926
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Перазлучыцца"
 
-#: ../src/empathy-main-window.c:932
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Зм�ніць на�тройкі конта"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1071
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Папоўніць %s (%s)..."
 
-#: ../src/empathy-main-window.c:1118
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Папоўніць грашовы балан� конта"
 
 #. top up button
-#: ../src/empathy-main-window.c:1189
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Папоўніць..."
 
-#: ../src/empathy-main-window.c:1931
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Кантакт"
 
-#: ../src/empathy-main-window.c:2306
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Каб убачыць кантакты, тр�ба ўключыць �кі-небудзь конт."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Каб убачыць кантакты, тр�ба ўключыць %s."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Спі� кантактаў"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "_Кантакты на карце"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "�а�тройкі конта"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Грашовы балан� конта"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_�ова� размова..."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "_Пошук у �пі�е кантактаў"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "�овы _званок..."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "_Далучыцца да ўпадабаных пако�ў"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Пошук кантактаў..."
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "�а�тройка �пі�а ўпадабаных пако�ў"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Перадача _файлаў"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "_Звычайны памер акна"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Паказваць _кантакты па-за �еткай"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "�овы _званок..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "_Паказваць інфармацыю аб пратаколе"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Звычайны памер акна з _аватарамі"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Грашовы балан� конта"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "_Кантакты на карце"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Конты"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Блакіраваны� кантакты"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_�а�тройкі"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "_Паказваць інфармацыю аб пратаколе"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "_Пошук у �пі�е кантактаў"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Сартаваць паводле і_мёнаў"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Сартаваць паводле �_тану"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Конты"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Звычайны памер акна з _аватарамі"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Блакіраваны� кантакты"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "_Звычайны памер акна"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Кампактны памер акна"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Перадача _файлаў"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "Пак_ой"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Далучыцца..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_�ова� размова..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Паказваць _кантакты па-за �еткай"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_��абі�ты� зве�ткі"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "Пак_ой"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "_Далучыцца да ўпадабаных пако�ў"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Пошук кантактаў..."
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "�а�тройка �пі�а ўпадабаных пако�ў"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4162,7 +4051,7 @@ msgstr "Удзельнікі"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4175,22 +4064,27 @@ msgstr ""
 "Патрабуецца пароль: %s\n"
 "Удзельнікі: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Так"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�е"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "�е ўдало�� атрымаць �пі� пако�ў"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "�е ўдало�� �пыніць атрыманне �пі�а пако�ў"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "�е ўдало�� загрузіць �пі� пако�ў"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Увай�ці ў пакой"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4200,6 +4094,10 @@ msgstr ""
 "пако�ў �а �пі�а."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "Пак_ой:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4207,18 +4105,14 @@ msgstr ""
 "Упішыце назву �ервера, �кі зм�шчае пакой, або пакіньце графу пу�той, калі ён "
 "зм�шчаецца на галоўным �ерверы конта"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Увай�ці ў пакой"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "�е ўдало�� загрузіць �пі� пако�ў"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Спі� пако�ў"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "Пак_ой:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "�трыманне паведамленн�"
@@ -4232,7 +4126,7 @@ msgid "New conversation"
 msgstr "�ова� размова"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Уваход кантакту ў �етку"
 
 #: ../src/empathy-preferences.c:170
@@ -4252,327 +4146,335 @@ msgid "Language"
 msgstr "Мова"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Мары��"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Грышка"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "�х, Грышка, н�добры! Як ты �палохаў м�не, гневаю�� не жартам!.."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Гневаеш��? ��праўда! � чаму ж ты на м�не так міленька пазіраеш?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr ""
 "Так, �а зло�ці!.. Дзе ты забаўл�ў��? Г�та ж зараз прыйдуць бацькі, а мы так "
 "многа маем з табою перагаварыць."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 "Выбачай, − чуць золак, � з'ездзіў ужо да ме�та, кінуў�� ў ногі а���ару і "
 "пра�іў, каб ён уз�ў на� пад �ваю апеку."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Тр�ба было завезці �кі га�цінчык."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Удзельнік Мары�� ц�пер па-за �еткай"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "�а�тройкі"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Паказваць вы�вы _заме�т �майлікаў"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "_Паказваць �пі� кантактаў у пако�х"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Выгл�д"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Паводзіны"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "�дкрываць чат у:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Матыў аздабленн� чату:"
+msgid "new ta_bs"
+msgstr "новай _картцы"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Выключаць апав�шч�нні ў р�жыме _ад�утна�ці ці зан�та�ці"
+msgid "new _windows"
+msgstr "новым _акне"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Выключыць гукавы� �ігналы ў р�жыме _ад�утна�ці ці зан�та�ці"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Паказваць уваходны� паведамленні ў абшары апав�шч�нн�ў"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_�ўтаматычна злучацца пры запу�ку"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Фільтрацы� р�ха дапамагае палепшыць �ка�ць гучанн� вашага гола�у дл� "
-"�уразмоўцы, але можа выклікаць на некаторых камп'ютарах п�ўны� праблемы. "
-"Калі вы ці ваш �уразмоўца падча� размовы чуеце дзіўны шум ці шчаўчкі, "
-"па�прабуйце выключыць фільтрацыю р�ха і паўтарыць званок."
+msgid "Log conversations"
+msgstr "Ве�ці журнал размоў"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "�пав�шчаць, калі кантакт уваходзіць у �етку"
+msgid "Behavior"
+msgstr "Паводзіны"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "�пав�шчаць, калі кантакт выходзіць з �еткі"
+msgid "General"
+msgstr "�гульнае"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "�пав�шчаць, калі акно _чату не мае фоку�у"
+msgid "_Enable bubble notifications"
+msgstr "_Уключыць апав�шч�нні ў вына�ках"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Прав�раць арфаграфію дл� на�тупных моў:"
+msgid "Disable notifications when _away or busy"
+msgstr "Выключаць апав�шч�нні ў р�жыме _ад�утна�ці ці зан�та�ці"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "�гульнае"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "�пав�шчаць, калі акно _чату не мае фоку�у"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "�пав�шчаць, калі кантакт уваходзіць у �етку"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Крыніцы даных аб ме�цазнаходжанні:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "�пав�шчаць, калі кантакт выходзіць з �еткі"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Ве�ці журнал размоў"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "�пав�шч�нні"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_�гучваць апав�шч�нні"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "�гучваць падзеі"
+msgid "Disable sounds when _away or busy"
+msgstr "Выключыць гукавы� �ігналы ў р�жыме _ад�утна�ці ці зан�та�ці"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Прыватна�ць"
+msgid "Play sound for events"
+msgstr "�гучваць падзеі"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Пагоршана� дакладна�ць даных аб ме�цазнаходжанні азначае, што публікавацца "
-"будуць толькі даны� аб горадзе, штаце і краіне вашага ме�цазнаходжанн�. GPS-"
-"каардынаты будуць акруглены да 1 знака па�л� ко�кі."
+msgid "Sounds"
+msgstr "Гукі"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Паказваць вы�вы _заме�т �майлікаў"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "_Ужыць фільтрацыю р�ха дл� пал�пш�нн� �ка�ці гучанн� званкоў"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "_Паказваць �пі� кантактаў у пако�х"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "Гукі"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Праверка арфаграфіі"
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Фільтрацы� р�ха дапамагае палепшыць �ка�ць гучанн� вашага гола�у дл� "
+"�уразмоўцы, але можа выклікаць на некаторых камп'ютарах п�ўны� праблемы. "
+"Калі вы ці ваш �уразмоўца падча� размовы чуеце дзіўны шум ці шчаўчкі, "
+"па�прабуйце выключыць фільтрацыю р�ха і паўтарыць званок."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "Спі� моў паказвае толькі мовы, дл� �кіх вы маеце ў�тал�ваны� �лоўнікі."
+msgid "_Publish location to my contacts"
+msgstr "_Паведамл�ць маім кантактам аб ме�цазнаходжанні"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Матывы"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "_Ужыць фільтрацыю р�ха дл� пал�пш�нн� �ка�ці гучанн� званкоў"
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"Пагоршана� дакладна�ць даных аб ме�цазнаходжанні азначае, што публікавацца "
+"будуць толькі даны� аб горадзе, штаце і краіне вашага ме�цазнаходжанн�. GPS-"
+"каардынаты будуць акруглены да 1 знака па�л� ко�кі."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "Вары�нт:"
+msgid "_Reduce location accuracy"
+msgstr "Па_гаршаць дакладна�ць ме�цазнаходжанн�"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "_�ўтаматычна злучацца пры запу�ку"
+msgid "Privacy"
+msgstr "Прыватна�ць"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "_Мабільны т�лефон"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Уключыць апав�шч�нні ў вына�ках"
+msgid "_Cellphone"
+msgstr "_Мабільны т�лефон"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_�гучваць апав�шч�нні"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Сетка (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Крыніцы даных аб ме�цазнаходжанні:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_�дкрываць новы� размовы ў а�обных вокнах"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "Спі� моў паказвае толькі мовы, дл� �кіх вы маеце ў�тал�ваны� �лоўнікі."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Паведамл�ць маім кантактам аб ме�цазнаходжанні"
+msgid "Enable spell checking for languages:"
+msgstr "Прав�раць арфаграфію дл� на�тупных моў:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Праверка арфаграфіі"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "Па_гаршаць дакладна�ць ме�цазнаходжанн�"
+msgid "Chat Th_eme:"
+msgstr "_Матыў аздабленн� чату:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Вары�нт:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Матывы"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Стан"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Вый�ці"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Зноў пазваніць кантакту"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Выключыць камеру"
+msgid "Redial"
+msgstr "Перазваніць"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Уключыць камеру"
+msgid "V_ideo"
+msgstr "_Від�а"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Выключыць від�а"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Выключыць від�акамеру і �пыніць перадачу від�а�ігналу"
+msgid "Video Preview"
+msgstr "Пап�р�дні від�аагл�д"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Уключыць від�акамеру і пачаць перадачу від�а�ігналу"
+msgid "Video On"
+msgstr "Уключыць від�а"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Уключыць від�акамеру, але не пачынаць перадачу від�а�ігналу"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Зноў пазваніць кантакту"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Пап�р�дні агл�д"
+msgid "Camera Off"
+msgstr "Выключыць камеру"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Перазваніць"
+msgid "Disable camera and stop sending video"
+msgstr "Выключыць від�акамеру і �пыніць перадачу від�а�ігналу"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Від�а"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Пап�р�дні агл�д"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Выключыць від�а"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Уключыць від�акамеру, але не пачынаць перадачу від�а�ігналу"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Уключыць від�а"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Уключыць камеру"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Пап�р�дні від�аагл�д"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Уключыць від�акамеру і пачаць перадачу від�а�ігналу"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Прагл�д карты кантактаў"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1585
 msgid "Save"
 msgstr "Захаваць"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1761
 msgid "Debug Window"
 msgstr "�кно адладкі"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1848
 msgid "Pause"
 msgstr "Прыпыніць"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:1860
 msgid "Level "
 msgstr "Узровень "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1879
 msgid "Debug"
 msgstr "�дладка"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1884
 msgid "Info"
 msgstr "Інфармацы�"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:1889 ../src/empathy-debug-window.c:1935
 msgid "Message"
 msgstr "Паведамленне"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1894
 msgid "Warning"
 msgstr "Пап�р�джанне"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:1899
 msgid "Critical"
 msgstr "Крытычна� памылка"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:1904
 msgid "Error"
 msgstr "Памылка"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:1923
 msgid "Time"
 msgstr "Ча�"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1926
 msgid "Domain"
 msgstr "Дамен"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:1928
 msgid "Category"
 msgstr "Кат�горы�"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:1930
 msgid "Level"
 msgstr "Узровень"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:1953
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4592,38 +4494,34 @@ msgstr "Выберыце кантакт, каб запраÑ�іць Ñ�го да Ñ
 msgid "Invite"
 msgstr "Запра�іць"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "�е паказваць ды�логавых акенцаў; выканаць працу (напрыклад, імпартаванне) і "
 "вый�ці"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "�е паказваць ды�логавых акенцаў, калі толькі не і�нуе іншых контаў акрам� "
 "\"Людзей паблізу\""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Спачатку вылучыць азначаны конт (напрыклад, \"gabble/jabber/"
 "foo_40example_2eorg0\")"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<ід�нтыфікатар-конта>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Паказаць памочніка контаў"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Конты Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Конты Empathy"
 
@@ -4639,7 +4537,7 @@ msgstr "- �дладчык Empathy"
 msgid "Empathy Debugger"
 msgstr "�дладчык Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Кліент чату Empathy"
 
@@ -4648,13 +4546,13 @@ msgid "Respond"
 msgstr "�дказаць"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Скінуць"
 
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "�дказаць"
 
@@ -4687,38 +4585,38 @@ msgstr ""
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "Ñ–"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "У чаканні"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "�б�згучана"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Прац�гла�ць"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d хв"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3214
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Б�гучы балан�: %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3218
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Вам не �тае грошай, каб выканаць г�ты званок."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3220
 msgid "Top Up"
 msgstr "Папоўніць"
 
@@ -4726,6 +4624,33 @@ msgstr "Папоўніць"
 msgid "_Match case"
 msgstr "_Улічваць р�гі�тр літар"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Тып вашага конта дл� чату"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Ствар�нне новага конта"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Людзі паблізу"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy умее аўтаматычна вышукваць і арганізоўваць чат з людзьмі, �кі� "
+"кары�таюцца вашай �еткай. Калі вы хочаце выкары�таць г�ту магчыма�ць, "
+"праверце правільна�ць на�троек, пададзеных ніж�й."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Пазней можна будзе зм�ніць г�ты� на�тройкі або наогул выключыць г�ту "
+"функцыю, выбраўшы <span style=\"italic\">Праўка → Конты</span> ў �пі�е "
+"кантактаў."
diff --git a/po/bg.po b/po/bg.po
index 31d73e329..0138f0b1c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,10 +1,10 @@
 # Bulgarian translation of empathy po-file.
-# Copyright (C) 2004, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Copyright (C) 2010 Damyan Ivanov
 # Copyright (C) 2011 Krasimir Chonov
 # This file is distributed under the same license as the empathy package.
 # Yasen Pramatarov <yasen@lindeas.com>, 2004.
-# Alexander Shopov <ash@kambanaria.org>, 2007, 2008, 2009, 2010, 2011.
+# Alexander Shopov <ash@kambanaria.org>, 2007, 2008, 2009, 2010, 2011, 2012.
 # Yavor Doganov <yavor@gnu.org>, 2009.
 # Damyan Ivanov <dam+gnome@ktnx.net>, 2010, 2011.
 # Krasimir Chonov <mk2616@abv.bg>, 2011.
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-15 10:04+0300\n"
-"PO-Revision-Date: 2011-10-15 10:04+0300\n"
-"Last-Translator: Krasimir Chonov <mk2616@abv.bg>\n"
+"POT-Creation-Date: 2012-02-18 07:15+0200\n"
+"PO-Revision-Date: 2012-02-18 07:15+0200\n"
+"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
@@ -41,27 +41,29 @@ msgstr "Моментни �ъобщени� � Empathy"
 msgid "IM Client"
 msgstr "Клиент за моментни �ъобщени�"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Управление на реги�трациите за �ъобщени� и телефони� през Интернет"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "Съобщени� и телефони�"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "�овите разговори да �е отвар�т в отделни прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Сила на звука при повикване"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Сила на звука при повикване в проценти."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "Уеб камера"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "Позици� на камерата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -69,58 +71,60 @@ msgstr ""
 "Знак, който да �е добави �лед п�евдонима при ползване на допи�ване на "
 "п�евдоними (� табулатор) в прозореца за групови разговори."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "Графична тема за прозореца за разговори"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "Графична тема за прозореца за разговори"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Спи�ък от двубуквените �ъкращени� на езиците � проверка за правопи� "
 "разделени �ъ� запета� (напр. „bg, en, ru“)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "Стегнат �пи�ък � контакти"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "Да �е използва управление на връзката"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "Критерий за подредбата на �пи�ъка � контактите"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
+"Път до обекта в D-Bus на по�ледната реги�траци�, използвана за влизане в "
+"�та�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Стандартна уеб камера за видео разговори, например /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "Стандартна папка, в ко�то да �е тър��т изображени� за аватари"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "Без изве�т�ване � из�качащи прозорци в �ъ�то�ние „От�ъ�тващ“"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "Без звуци звуци в �ъ�то�ние „От�ъ�тващ“"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "Показване на вход�щи �ъбити� в обла�тта за �ъ�то�нието"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -128,142 +132,150 @@ msgstr ""
 "Показване на вход�щите �ъбити� в обла�тта за �ъ�то�нието. �ко е лъжа, "
 "�ъбити�та �е пред�тав�т незабавно на потребител�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "Премахване на ехо"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "Empathy може да публикува ме�тоположението на потребител�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy може да ползва GPS, за да отгатне ме�тоположението"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 "Empathy може да използва мобилна телефонна мрежа, за да отгатне "
 "ме�тоположението"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy може да ползва мрежата, за да отгатне ме�тоположението"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Стандартна папка за получените файлове от Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr "�втоматично преминаване в �ъ�то�ние „От�ъ�тващ“ при бездей�твие"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "�втоматично �вързване при �тартиране"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "�амал�ване на точно�тта на ме�тоположението"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Иконата на прозореца за разговори да е аватарът на контакта"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "Включване на ин�трументите за разработка на WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "Изве�т�ване � из�качащи прозорци при нови �ъобщени�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "Да �е ползва проверка на правопи�а"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "Скриване на о�новни� прозорец"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "Скриване на о�новни� прозорец."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "Информиране на другите уча�тници, че им пишете"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Last account selected in Join Room dialog"
-msgstr ""
+msgstr "По�ледната реги�траци� използвана в прозореца „Влизане в �та�“"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Знак за допи�ване на п�евдоними"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Отвар�не на разговорите в отделни прозорци"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Път до темата на Adium, ко�то да �е ползва"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Път до темата на Adium, ко�то да �е ползва, ако темата за разговори е Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../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:41
+#: ../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:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Изве�т�ване �ъ� звук при изпращане на �ъобщение"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Изве�т�ване �ъ� звук при влизане на контакт в мрежата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../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:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Изве�т�ване �ъ� звук при влизането ви в мрежата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Изве�т�ване �ъ� звук при излизането ви от мрежата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Изве�т�ване � из�качащи прозорци, когато разговорът не е на фоку�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Изве�т�ване � из�качащи прозорци, когато контакт влезе в мрежата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Изве�т�ване � из�качащи прозорци, когато контакт излезе извън мрежата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Position the camera preview should be during a call."
 msgstr ""
 "Позиционирането на изображението от камерата да �тава по време на разговор."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "Показване на кредита в �пи�ъка � контакти"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Показване на аватари"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "Показване на групите � контакти"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Показване на �пи�ъка � контакти в �таите"
@@ -435,17 +447,25 @@ msgid "Whether to play sound notifications when away or busy."
 msgstr "Дали в �ъ�то�ние „Зает“ или „От�ъ�тващ“ да �е изве�т�ва �ъ� звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Дали да �е изпращат �ъ�то�ни� „Пишещ“ или „Спр�л“. За момента те не �е "
+"пращат, когато о�новното �ъ�то�ние е „От�ъ�тващ“."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Дали излизането на контакт извън мрежата да �е изве�т�ва � из�качащи "
 "прозорци."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Дали влизането на контакт в мрежата да �е изве�т�ва � из�качащи прозорци."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -453,46 +473,50 @@ msgstr ""
 "Дали получаването на ново �ъобщение, когато отворени�т прозорец за разговори "
 "не е на фоку�, да �е изве�т�ва � из�качащи прозорци."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Дали получаването на ново �ъобщение да �е изве�т�ва � из�качащи прозорци."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr ""
 "Дали да �е показва о�таващи�т кредит на реги�траци�та в �пи�ъка за контакти."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Дали да �е показват аватари в �пи�ъците за контакти и прозорците за "
 "разговори."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Дали контактите, които в момента не �а включени да �е показват в �пи�ъка."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr "Дали да �е показват групите в �пи�ъка за контакти."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Дали в �ъ�то�ние „Зает“ или „От�ъ�тващ“ да �е изве�т�ва � из�качащи прозорци."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Дали да �е показват протоколите в �пи�ъците за контакти."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Дали �пи�ъкът � контакти да �е показва в �таите за разговори."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "Дали да �е ползва �тегнат изглед за �пи�ъка � контактите."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -500,43 +524,61 @@ msgstr ""
 "Дали да �е показва �ъобщение за затвар�нето на о�новни� прозорец при "
 "нати�кане на бутона „×“ в заглавната лента."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "Дали да �е ползва графична тема за �таите за разговори."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "Кой критерий да �е използва за подредбата на �пи�ъка � контактите. "
-"Стандартната �тойно�т е „name“ — подредба по име. Стойно�т „state“ означава "
-"подреждане по �ъ�то�ние."
+"Стандартната �тойно�т е „state“ — подреждане по �ъ�то�ние.  Стойно�т „name“ "
+"�мен� на подредба по име."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Управление на реги�трациите за �ъобщени� и телефони� през Интернет"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "�е е указана причина"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Съобщени� и телефони�"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "За�вена бе пром�на в �ъ�то�нието"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Преу�тановихте прехвърл�нето на файл"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "От�рещната �трана преу�танови прехвърл�нето на файл"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Грешка по време на прехвърл�нето на файл"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "От�рещната �трана не може да прехвърл� файл"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "�еизве�тна причина"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Прехвърл�нето на файл завърши, но файлът е повреден"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Отдалечени�т контакт не поддържа прехвърл�не на файлове"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Избрани�т файл не е обикновен файл"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Избрани�т файл е празен"
 
@@ -556,170 +598,138 @@ msgstr "%s ви потър�и"
 msgid "Call from %s"
 msgstr "Повикване от %s"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "Този вид гнездо не �е поддържа"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "�е е указана причина"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "За�вена бе пром�на в �ъ�то�нието"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "Преу�тановихте прехвърл�нето на файл"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "От�рещната �трана преу�танови прехвърл�нето на файл"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "Грешка по време на прехвърл�нето на файл"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "От�рещната �трана не може да прехвърл� файл"
-
-#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "�еизве�тна причина"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "�а лини�"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Зает"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "От�ъ�тващ"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "�евидим"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Извън мрежата"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "�е е указана причина"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Съ�то�нието е „Извън мрежата“."
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:75
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Мрежова грешка"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "�еу�пешно идентифициране"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Грешка в шифрирането"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Името е заето"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "�е е предо�тавен �ертификат"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертификатът не е доверен"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертификатът е изтекъл"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертификатът не е вл�зъл в �ила"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "�е�ъвпадение на името � това в �ертификата"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "�е�ъвпадение на отпечатъка на �ертификата"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Сертификатът е �амоподпи�ан"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Грешка в �ертификата"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "�е е налично шифриране"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Сертификатът е неправилен"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Връзката е отказана"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "�е може да �е у�танови връзка"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Връзката прекъ�на"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Ре�ур�ът вече е �вързан към �ървъра"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Реги�траци�та вече е �вързана към �ървъра"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Връзката бе заме�тена от нова връзка, използваща �ъщи� ре�ур�"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "�а �ървъра вече има реги�траци� � такова име."
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "В момента �ървърът е твърде натоварен, за да обработи за�вката за �вързване"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертификатът е анулиран"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Сертификатът използва не�игурен шифър или �лаб алгоритъм за шифриране"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -727,171 +737,147 @@ msgstr ""
 "Дължината на �ертификата на �ървъра или дълбочината на �ертификационната му "
 "верига надхвърл� ограничени�та на криптограф�ката библиотека"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
-msgstr ""
+msgstr "Софтуерът ви е прекалено о�тар�л"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Вътрешна грешка"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Хора наблизо"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! от Япони�"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
 # Би тр�бвало тран�литерирани� вариант „Фей�бук“ да е наложен вече
 # �поред http://www.ivosiromahov.com/2_article/a46.html.
 # Иво Сиромахов като лингви�тичен тренд�етър, мали, мали!
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Разговор във Фей�бук"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "преди %d �екунда"
 msgstr[1] "преди %d �екунди"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "преди %d минута"
 msgstr[1] "преди %d минути"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "преди %d ча�"
 msgstr[1] "преди %d ча�а"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "преди %d ден"
 msgstr[1] "преди %d дни"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "преди %d �едмица"
 msgstr[1] "преди %d �едмици"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "преди %d ме�ец"
 msgstr[1] "преди %d ме�еца"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "в бъдеще"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "В�ички реги�трации"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Реги�траци�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Парола"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Сървър"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Моите уеб реги�трации"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Реги�траци�та %s �е редактира чрез %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Реги�траци�та %s не може да �е редактира в Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Стартиране на „Моите уеб реги�трации“"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Редактиране на %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Потребител�ко име:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Прилагане"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Включване в мрежата"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Вече има реги�траци� � такова име на �ървъра."
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Създаване на нова реги�траци� на �ървъра"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "_Отказ"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Реги�траци� в %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "�ова реги�траци�"
 
@@ -939,7 +925,7 @@ msgstr "Запомн�не"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "Запомн�не"
 
@@ -1266,7 +1252,7 @@ msgid "STUN Server:"
 msgstr "Сървър за STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "Сървър:"
 
@@ -1374,44 +1360,44 @@ msgstr "С този протокол не могат да Ñ�е провеждаÑ
 
 #: ../libempathy-gtk/empathy-call-utils.c:59
 msgid "You don't have enough credit in order to place this call"
-msgstr ""
+msgstr "��мате до�татъчно кредит, за да извършите това обаждане"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "�еу�пешно започване на личен разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "В този разговор не �е поддържа тема"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "��мате право да �мените темата"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "„%s“ не е правилно име на контакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: изчи�тване на в�ички �ъобщени� в текущи� разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: задаване на темата на текущи� разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 "/join <идентификатор на �та� за разговор>: влизане в нова �та� за разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 "/j <идентификатор на �та� за разговор>: влизане в нова �та� за разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1419,26 +1405,26 @@ msgstr ""
 "/part [<идентификатор на �та� за разговор>] [<причина>]: напу�кане на �та�, "
 "по подразбиране текущата"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 "/query <идентификатор на контакт> [<�ъобщение>]: започване на личен разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 "/msg <идентификатор на контакт> <�ъобщение>: започване на личен разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <пр�кор>: �м�на на пр�кора ви за текущи� �ървър"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <�ъобщение>: изпращане на �ъобщение „за дей�твие“ в текущи� разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1448,11 +1434,11 @@ msgstr ""
 "при �ъобщени� започващи � „/“. �апр.: „/say /join �е използва за влизане в "
 "нова �та� за разговор“"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <контакт>: показва информаци� за контакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1460,121 +1446,128 @@ msgstr ""
 "/help [<команда>]: показване на в�ички поддържани команди. �ко има такава "
 "<команда>, �е показва нейната употреба."
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Употреба: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "�еизве�тна команда"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "�еизве�тна команда. Пробвайте � „/help“ — ще �е изведат поддържаните команди"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "недо�татъчен кредит за изпращане на �ъобщението"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Грешка при изпращането на �ъобщението „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Грешка при изпращането на �ъобщението: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
-msgstr "недо�татъчен кредит за изпращане на �ъобщението"
+msgstr ""
+"недо�татъчен кредит за изпращане на �ъобщението. <a href='%s'>Захранване</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "лип�ва такава възможно�т"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "изключен"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "грешен контакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "лип�ват права"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "прекалено дълго �ъобщение"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "не е реализирано"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "неизве�тна грешка"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Темата вече е: „%s“"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s �мени темата на „%s“"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "�е е зададена тема"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(н�ма предложени�)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Добав�не на „%s“ към речник"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Добав�не на „%s“ към речника %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Вмъкване на емотикон"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
-#: ../libempathy-gtk/empathy-ui-utils.c:1843
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Изпращане"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2373
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Предложени� за правопи�"
 
-#: ../libempathy-gtk/empathy-chat.c:2462
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "�еу�пех при получаването на предишните разговори"
 
-#: ../libempathy-gtk/empathy-chat.c:2599
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s прекъ�на връзката"
@@ -1582,12 +1575,12 @@ msgstr "%s прекъ�на връзката"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s бе изритан от %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s бе изритан"
@@ -1595,17 +1588,17 @@ msgstr "%s бе изритан"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2617
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s бе по�тавен под възбрана от %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s бе по�тавен под възбрана"
 
-#: ../libempathy-gtk/empathy-chat.c:2624
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s излезе от �та�та"
@@ -1615,17 +1608,17 @@ msgstr "%s излезе от �та�та"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2633
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2658
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s влезе в �та�та"
 
-#: ../libempathy-gtk/empathy-chat.c:2683
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s в момента е познат като %s"
@@ -1633,88 +1626,88 @@ msgstr "%s в момента е познат като %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2836
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1546
-#: ../src/empathy-call-window.c:1596 ../src/empathy-call-window.c:2642
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Изключен"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3482
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "И�кате ли паролата да �е запомни?"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Запомн�не"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "�е �ега"
 
-#: ../libempathy-gtk/empathy-chat.c:3542
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "�ов опит"
 
-#: ../libempathy-gtk/empathy-chat.c:3546
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Паролата е грешна, пробвайте отново:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3676
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Ста�та изи�ква парола:"
 
-#: ../libempathy-gtk/empathy-chat.c:3703
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
-msgstr "При�ъедин�ване"
+msgstr "Влизане"
 
-#: ../libempathy-gtk/empathy-chat.c:3891 ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Свързан"
 
-#: ../libempathy-gtk/empathy-chat.c:3946
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Разговор"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3951
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "�епознат или неправилен идентификатор"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Блокирането на контакт временно е недо�тъпно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Блокирането на контакт е недо�тъпно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "До�тъпът е отказан"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Контактът не може да �е блокира"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:783
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Редактиране на блокирани контакти"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1726,62 +1719,53 @@ msgstr "Блокирани контакти"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Изтриване"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Копиране на адре�а"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Отвар�не на адре�а"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%d.%m.%Y, %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Редактиране на данните за контакта"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Лични данни"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "�ов контакт"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Блокиране на „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Сигурни ли �те, че и�кате да забраните на „%s“ да �е �вързва � ва�?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Блокиране"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Докладване на този контакт за злоупотреба"
@@ -1799,262 +1783,125 @@ msgstr "И�кане за запи�ване"
 msgid "_Block User"
 msgstr "_Блокиране"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1935
-#: ../libempathy-gtk/empathy-individual-view.c:2375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Сигурни ли �те, че и�кате да изтриете групата „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1937
-#: ../libempathy-gtk/empathy-individual-view.c:2378
-msgid "Removing group"
-msgstr "Изтриване на група"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
-msgid "_Remove"
-msgstr "_Изтриване"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2016
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Сигурни ли �те, че и�кате да изтриете контакта „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2018
-#: ../libempathy-gtk/empathy-individual-view.c:2521
-msgid "Removing contact"
-msgstr "Изтриване на контакт"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Добав�не на контакт…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:292
-msgid "_Block Contact"
-msgstr "_Блокиране на контакта"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:321
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Разговор"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:353
-#: ../libempathy-gtk/empathy-individual-menu.c:850
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_�удио разговор"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:386
-#: ../libempathy-gtk/empathy-individual-menu.c:895
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Видео разговор"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-individual-menu.c:948
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Предишни разговори"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:454
-#: ../libempathy-gtk/empathy-individual-menu.c:989
-msgid "Send File"
-msgstr "Изпращане на файл"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:477
-#: ../libempathy-gtk/empathy-individual-menu.c:1031
-msgid "Share My Desktop"
-msgstr "Сподел�не на работното м��то"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:506
-#: ../libempathy-gtk/empathy-individual-menu.c:1094
-msgid "Infor_mation"
-msgstr "_Данни за контакта"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:552
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Редактиране"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:606
-#: ../libempathy-gtk/empathy-individual-menu.c:1285
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Получена е покана за тази �та�"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:637
-#: ../libempathy-gtk/empathy-individual-menu.c:1331
-msgid "_Invite to Chat Room"
-msgstr "Изпращане на _покана за �та�та"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Тър�ене на контакти"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Контакт:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Добав�не на контакт"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "��ма намерени контакти"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Съобщение � което �е пред�тав�те:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr ""
 "Позволете ми да виждам когато �те на лини�. Благодар�!\n"
 "Please let me see when you're online. Thanks!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Пълно име:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Телефонен номер:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "�дре� на е-поща:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Уеб�айт:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Рожден ден:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "По�ледно вид�н:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Свързан от:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Съобщение при напу�кане:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Канали:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Код на държавата по ISO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Държава:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Щат:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Град:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Обла�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Пощен�ки код:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Улица:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Сграда:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Етаж:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Ста�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Тек�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Опи�ание:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "�дре� в Интернет:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "�иво на точно�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Вертикална грешка (метри):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Хоризонтална грешка (метри):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Скоро�т:"
 
@@ -2062,71 +1909,140 @@ msgstr "Скоро�т:"
 # дадената позици�.  От друга �трана, пеленг може би е прекалено т��но
 # терминологично в �ферата на мор�ката/въздушната навигаци�.
 # Пеленг �тава
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Пеленг:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Скоро�т на изкачване:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "По�ледно обнов�ване на:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Дължина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Широчина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Ви�очина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "Ме�тоположение"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y в %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Запазване на аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "�еу�пех при запазването на аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1066
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Любимо"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Лични данни"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "Подробни данни за контакта"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Пълно име"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Телефонен номер"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "�дре� на е-поща"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Уеб�айт"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Рожден ден"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "По�ледно вид�н:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Свързан от:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Съобщение при напу�кане:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "работен"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "домашен"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "мобилен"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "гла�ови"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "предпочитан"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "пощен�ки"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "за до�тавка"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
@@ -2134,7 +2050,7 @@ msgstr "<b>Ме�тоположение</b> на (дата)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "П�евдоним:"
 
@@ -2146,15 +2062,10 @@ msgstr "Данни за клиента"
 msgid "Client:"
 msgstr "Клиент:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Подробни данни за контакта"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Идентификатор:"
 
@@ -2171,11 +2082,11 @@ msgstr "ОС:"
 msgid "Version:"
 msgstr "Вер�и�:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Групи"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2183,105 +2094,171 @@ msgstr ""
 "Изберете групите, в които контактът да �е по�в�ва. Можете да изберете 0 или "
 "повече групи."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Добав�не на група"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Избор"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1967
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Следни�т контакт ще бъде блокиран:"
 msgstr[1] "Следните контакти ще бъдат блокирани:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Следни�т контакт не може да бъде блокирана:"
 msgstr[1] "Следните контакти не могат да бъдат блокирани:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Свързани контакти"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Изберете контакти за �вързване"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Преглед на нов контакт"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Избраните контакти от �пи�ъка вл�во ще бъдат �вързани."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Редактиране на данните за контакта"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Изберете реги�траци� за провеждане на разговора"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "Разговор"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мобилен"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Зает"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "��Ч�ЛО"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:805
-#: ../libempathy-gtk/empathy-new-message-dialog.c:295
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Блокиране на контакта"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "_Разговор"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1143
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_�удио разговор"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Видео разговор"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "_Previous Conversations"
+msgstr "_Предишни разговори"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Изпращане на файл"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Сподел�не на работното м��то"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Любимо"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "Пакетът gnome-contacts не е ин�талиран"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Ин�талирайте пакета „gnome-contacts“, за да до�тъпите данните на контакта."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Данни за контакта"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Пром�на"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1169
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Свързване на контакти…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Получена е покана за тази �та�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Изпращане на _покана за �та�та"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "_Добав�не на контакт…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Изтриване и _блокиране"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Сигурни ли �те, че и�кате да изтриете групата „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Изтриване на група"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Изтриване"
+
+#: ../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 "
@@ -2290,7 +2267,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"
@@ -2305,19 +2286,19 @@ msgstr "<b>Ме�тоположение</b> на (дата)"
 msgid "Online from a phone or mobile device"
 msgstr "В мрежата през телефон или мобилно у�трой�тво"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "�ова мрежа"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Избор на мрежа за IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Изчи�тване на _�пи�ъка � мрежи"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Избор"
@@ -2330,178 +2311,135 @@ msgstr "нов �ървър"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Свързване на контакти"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Раздел�не…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Раздроб�ване на �ъбирателни� контакт на �ъдържаните в него контакти."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Свързване"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Да �е раздели ли �ъбирателни�т контакт „%s“?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Сигурни ли �те, че и�кате да раздробите този �ъбирателен контакт? Дей�твието "
-"ще раздели отделните контакти, които го �ъ�тавл�ват."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Раздел�не"
-
-#: ../libempathy-gtk/empathy-log-window.c: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 "%e %B %Y, %A, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s �екунда"
 msgstr[1] "%s �екунди"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s минута"
 msgstr[1] "%s минути"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Разговорът продължи %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
+#: ../libempathy-gtk/empathy-log-window.c:3044
 #: ../src/empathy-preferences.ui.h:4
 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 "Изтриване от:"
 
@@ -2530,7 +2468,7 @@ msgstr "Видео"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "Р_едактиране"
 
@@ -2542,87 +2480,82 @@ msgstr "_Файл"
 msgid "page 2"
 msgstr "�тр. 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Идентификатор:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.c:77
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
-msgstr "Избрани�т контакт е извън лини�"
+msgstr "Контактът е извън лини�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:79
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
-msgstr "Избрани�т контакт е неправилен"
+msgstr "Избрани�т контакт е неправилен или непознат"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
-msgstr "В този разговор не �е поддържа тема"
+msgstr "Контактът не поддържа този тип разговор"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
-msgstr ""
+msgstr "Тази функционално�т не �е поддържа от реализаци�та на протокола"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
-msgstr ""
+msgstr "�е може да �е започне разговор � този контакт"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:91
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
-msgstr ""
+msgstr "Забранено ви е да влизате в този контакт"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:93
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
-msgstr ""
+msgstr "Каналът е пълен"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:95
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
-msgstr "Кан�т ви да �е при�ъедините към %s"
+msgstr "За да влезете в този канал, тр�бва да бъдете поканени"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
-msgstr "Контактът не е в мрежата"
+msgstr "Командата не може да �е изпълни, когато не �те �вързани"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
-msgstr "лип�ват права"
+msgstr "До�тъпът е отказан"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
-msgstr "Възникна грешка при започването на разговор."
+msgstr "Възникна грешка при започването на разговор"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:305
-msgid "C_hat"
-msgstr "_Разговор"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "Въведете идентификатор на контакт или телефонен номер:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:324
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "�ов разговор"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Изпращане на _видео"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+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
+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 "Authentification failed for account <b>%s</b>"
+msgstr "�еу�пешно идентифициране за реги�траци�та <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2659,12 +2592,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 "Други �ъобщени�…"
 
@@ -2741,12 +2670,12 @@ msgstr "�удио разговорът завърши"
 msgid "Edit Custom Messages"
 msgstr "Редактиране на други �ъобщени�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1044
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Редактирано в %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1749
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "�ормално"
 
@@ -2823,43 +2752,47 @@ msgid "Certificate hostname: %s"
 msgstr "Име на хо�т в �ертификата: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Продължаване"
+msgid "C_ontinue"
+msgstr "_Продължаване"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "�едоверена връзка"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Връзката не е надеждна. Желаете ли да продължите въпреки това?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запомн�не на избора за бъдещи връзки"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Информаци� за �ертификата"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1738
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "�дре�ът не може да бъде отворен"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1835
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Избор на файл"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1907
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "�едо�татъчно �вободно м��то за запазване на файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1915
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
-"За запазването на файла �а необхоими %s, но �вободни �а едва %s. Изберете "
+"За запазването на файла �а необходими %s, но �вободни �а едва %s. Изберете "
 "друго ме�тоположение."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1959
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Вход�щ файл от %s"
@@ -3031,31 +2964,31 @@ msgstr "западен"
 msgid "Vietnamese"
 msgstr "виетнам�ки"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Лип�ва �ъобщение за грешка"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Бързо �ъобщение (Empathy)"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "Без автоматично �вързване при �тартиране"
 
-#: ../src/empathy.c:438
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Без показване на �пи�ъка � контакти и други прозорци при �тартиране"
 
-#: ../src/empathy.c:453
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "— моментни �ъобщени� � Empathy"
 
-#: ../src/empathy.c:640
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "Грешка при �вързване � управлението на реги�трации"
 
-#: ../src/empathy.c:642
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3101,11 +3034,11 @@ msgstr ""
 "заедно � тази програма. �ко не �те, пишете до Free Software Foundation, "
 "Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Програма за моментни �ъобщени� за GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Я�ен Праматаров <yasen@lindeas.com>\n"
@@ -3118,226 +3051,74 @@ msgstr ""
 "�аучете повече за на� на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Възникна грешка при вна��нето на реги�трации."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Възникна грешка при анализирането на данните на реги�траци�та."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Възникна грешка при �ъздаване на реги�траци�та."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Възникна грешка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Съобщението за грешка бе: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Може да �е върнете назад и да опитате да въведете данните за реги�траци�та "
-"наново или да излезете от този помощник и да добавите реги�трациите по-къ�но "
-"от менюто „Редактиране“."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Възникна грешка"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Какъв вид реги�траци� имате?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Имате ли н�какви други реги�трации, които и�кате да на�троите?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Въведете данните за реги�траци�та ви"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Какъв вид реги�траци� и�кате да �ъздадете?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "И�кате ли да �ъздадете друг вид реги�трации?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Въведете данните за новата реги�траци�"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Чрез Empathy може да разговар�те � хора от локалната ви мрежа, при�тели и "
-"колеги ползващи Google Talk, AIM, Windows Live и много други програми за "
-"разговор. С микрофон или уеб-камера може да провеждате и аудио/видео "
-"разговори."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Имате ли реги�траци�, ко�то �те ползвали � друга програма за разговори?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Да, да �е вне�ат данните за реги�траци�та ми от "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Да, ще въведа данните за реги�траци�та ми �ега"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "�е, и�кам нова реги�траци�"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "�е, за�ега и�кам про�то да виждам хората в локалната мрежа"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Изберете реги�трациите за вна��не:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Да"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "�е, това е в�ичко за�ега"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy може автоматично да открива и хората, които �а �вързани в �ъщата "
-"мрежа като ва�, и да започва разговор � т�х. �ко и�кате да ползвате тази "
-"възможно�т, проверете дали на�тройките отдолу �а верни. Можете да ги "
-"промените по-къ�но, както и да изключите изц�ло тази възможно�т от прозореца "
-"„Реги�трации“."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Редактиране→Реги�трации"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "_�е, за�ега тази възможно�т да не �е включва"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"��ма да може да разговар�те � хората �вързани към локалната ви мрежа, защото "
-"пакетът telepathy-salut не е ин�талиран. За да включите тази възможно�т, "
-"ин�талирайте пакета и �ъздайте реги�траци� „Хора наблизо“ в прозореца за "
-"реги�трации."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "Пакетът telepathy-salut не е ин�талиран"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Помощник за �ъобщени� и телефони� през Интернет"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Добре дошли в Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Вна��не на �ъще�твуващи реги�трации"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Въведете още информаци�"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:71
 #, 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:75
 msgid "Your new account has not been saved yet."
 msgstr "Реги�траци�та ви в�е още не е запазена."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1330
+#: ../src/empathy-accounts-dialog.c:347
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Свързване…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "Извън мрежата — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Изключен — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "Извън мрежата — лип�ва връзка"
 
 # FIXME: термини за offine и disconnected
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "�еизве�тно �ъ�то�ние"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:430
 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:533
+msgid "Edit Connection Parameters"
+msgstr "Редактиране на на�тройките на връзката"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:696
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Личните ви данни не могат да бъдат изтеглени от �ървъра."
+
+#: ../src/empathy-accounts-dialog.c:702
+msgid "Go online to edit your personal information."
+msgstr "Влезте в мрежата, за да редактирате личните �и данни."
+
+#: ../src/empathy-accounts-dialog.c:787
+msgid "_Edit Connection Parameters..."
+msgstr "_Редактиране на на�тройките на връзката…"
+
+#: ../src/empathy-accounts-dialog.c:1283
 #, 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:1287
 msgid "This will not remove your account on the server."
 msgstr "Това н�ма да изтрие реги�траци�та ви от �ървъра."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3346,15 +3127,23 @@ msgstr ""
 "промените ви. И�кате ли да продължите?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "_Включване"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "_Изключване"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Пре�качане"
+
+#: ../src/empathy-accounts-dialog.c:2087
+msgid "_Connect"
+msgstr "_Свързване"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3371,14 +3160,10 @@ msgid "Loading account information"
 msgstr "Зареждане на данните за контакта"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "�е е ин�талиран протокол"
+msgid "No protocol backends installed"
+msgstr "�е �а ин�талирани модулите за поддръжка на този протокол"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Протокол:"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3386,125 +3171,116 @@ msgstr ""
 "За да добавите нова реги�траци�, тр�бва да имате модул, който поддържа "
 "нейни� протокол."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "_Вна��не…"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " — идентифициране � Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Идентифициране � Empathy"
 
-# FIXME: Това е връзка чрез mDNS/DNS-SD, �иреч Avahi.  „Хора наблизо“ е
-# до�та объркващо, защото контакти от локалната мрежа не е задължително
-# да �а наблизо, както и контакти от други мрежи може да �а �ъв�ем
-# наблизо.
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Хора наблизо"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr " — телефонна/видео връзка � Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Телефонна/видео връзка � Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Контра�т"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Ярко�т"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Гама корекци�"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "Сила на звука"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "_Странична лента"
 
-#: ../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:1939
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Разговор � %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2183
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "Ме�тен адре�, както �е вижда оттук"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2185
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Ме�тен адре�, както �е вижда от �ървър в Интернет"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "�дре� на от�рещната �трана, както �е вижда оттам"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2189
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "�дре� на препредаващи� �ървър"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2191
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "�дре� на групата за разпръ�кване (multicast)"
 
-#: ../src/empathy-streamed-media-window.c:1843
-#: ../src/empathy-streamed-media-window.c:1846
-#: ../src/empathy-streamed-media-window.c:1849
-#: ../src/empathy-streamed-media-window.c:1852
-#, fuzzy
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
-msgstr "�еизве�тно"
+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:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2961
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Техниче�ки данни"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2999
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3513,8 +3289,8 @@ msgstr ""
 "Софтуерът на %s не поддържа никой от аудио форматите, поддържани на ваши� "
 "компютър"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:3004
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3523,8 +3299,8 @@ msgstr ""
 "Софтуерът на %s не поддържа никой от видео форматите, поддържани на ваши� "
 "компютър"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:3010
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3533,29 +3309,29 @@ msgstr ""
 "�е може да �е о�ъще�тви връзка � %s, чи�то мрежа, веро�тно, не поддържа "
 "преки връзки."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:3016
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "Мрежова грешка"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:3020
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3100
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Програмите за аудио форматите, изи�квани за този разговор, не �а ин�талирани "
 "на компютъра ви"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3103
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Програмите за видео форматите, изи�квани за този разговор, не �а ин�талирани "
 "на компютъра ви"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3566,23 +3342,23 @@ msgstr ""
 "\">докладвайте този проблем</a> и прикачете журналните файлове указани в "
 "прозореца „Изчи�тване на грешки“ от менюто „Помощ“."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:3044
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "Грешка в модула за разговори"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:3047
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "До�тигнат е кра�т на потока"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:3087
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "Потокът на аудио връзката не може да бъде о�ъще�твен"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:3097
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "Потокът на видео връзката не може да бъде о�ъще�твен"
 
@@ -3673,8 +3449,8 @@ msgstr "Превключване на пращането на видео"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2591 ../src/empathy-call-window.c:2592
-#: ../src/empathy-call-window.c:2593 ../src/empathy-call-window.c:2594
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
 msgid "Unknown"
 msgstr "�еизве�тно"
 
@@ -3692,17 +3468,17 @@ 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
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_Ръковод�тво"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_Изчи�тване на грешки"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "Помо_щ"
 
@@ -3715,51 +3491,100 @@ msgid "_Settings"
 msgstr "_�а�тройки"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Преглед"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Да �е затвори ли този прозорец?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"�ко затворите този прозорец, ще напу�нете %s. ��ма да получавате други "
+"�ъобщени� докато не влезете отново."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"�ко затворите този прозорец, ще напу�нете �та�та. ��ма да получавате други "
+"�ъобщени� докато не влезете отново в не�."
+msgstr[1] ""
+"�ко затворите този прозорец, ще напу�нете %u �таи. ��ма да получавате други "
+"�ъобщени� докато не влезете отново в т�х."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Излизане от %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"��ма да получавате други �ъобщени� от тази �та�, докато не влезете отново в "
+"не�."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Затвар�не на прозореца"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Излизане от �та�та"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d непрочетено)"
 msgstr[1] "%s (%d непрочетени)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (и %u друго)"
 msgstr[1] "%s (и %u други)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d непрочетено от други)"
 msgstr[1] "%s (%d непрочетени от други)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d непрочетено от в�ички)"
 msgstr[1] "%s (%d непрочетени от в�ички)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Изпращане на %d �ъобщение"
 msgstr[1] "Изпращане на %d �ъобщени�"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Пише �ъобщение."
 
@@ -3839,96 +3664,96 @@ msgstr "�втоматично �вързване"
 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:1563
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
 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:1569
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Вход�щ разговор от %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:1569
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Вход�щ видео разговор от %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"
+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"
+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-event-manager.c:860
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
-msgstr "_При�ъедин�ване"
+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"
+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"
+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:1145 ../src/empathy-main-window.c:378
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Парола"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../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:1214
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3938,105 +3763,105 @@ msgstr ""
 "Съобщение: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u ч., %02u м. и %02u �ек."
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u м. и %02u �ек."
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s от общо %s, � %s/�ек."
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s от общо %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Получаване на файла „%s“ от %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Изпращане на файла „%s“ до %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Грешка при получаване на „%s“ от %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Грешка при получаване на файл"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Грешка при изпращане на „%s“ до %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Грешка при изпращане на файл"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ получен от %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "„%s“ изпратен до %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Прехвърл�нето на файл завърши"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Изчакване на отговора на други� уча�тник"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Проверка на цело�тта на „%s“"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Изчи�л�ване на извадката на „%s“"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Файл"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "О�тават"
 
@@ -4050,7 +3875,11 @@ msgstr ""
 "Изчи�тване на завършените, отменените и неу�пешните прехвърл�ни� на файлове "
 "от �пи�ъка"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Вна��не"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4058,166 +3887,186 @@ msgstr ""
 "�е �а открити реги�трации за вна��не. Empathy поддържа в момента вна��не "
 "�амо от Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Вна��не на реги�трации"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Вна��не"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Източник"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Паролата ви"
 
-#: ../src/empathy-main-window.c:401
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Прекъ�ване"
 
-#: ../src/empathy-main-window.c:642
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr ""
+"Тр�бва да на�троите поне една реги�трации, за да �е по�в�т контакти тук."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "�е е намерено �ъвпадение"
 
-#: ../src/empathy-main-window.c:750
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
+"Реги�трациите за %s н�ма да могат да �е ползват, преди да обновите �офтуера "
+"за %s."
 
-#: ../src/empathy-main-window.c:818
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
-msgstr ""
+msgstr "Обнов�ване на �офтуера…"
 
-#: ../src/empathy-main-window.c:824 ../src/empathy-main-window.c:949
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Затвар�не"
 
-#: ../src/empathy-main-window.c:937
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "�ово �вързване"
 
-#: ../src/empathy-main-window.c:943
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Редактиране на реги�траци�"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1088
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Захранване на %s (%s)…"
 
-#: ../src/empathy-main-window.c:1135
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Захранване на кредита"
 
 #. top up button
-#: ../src/empathy-main-window.c:1206
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Захранване…"
 
-#: ../src/empathy-main-window.c:1949
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../src/empathy-main-window.c:2324
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"Тр�бва да включите поне една от реги�трациите �и, за да �е по�в�т контакти "
+"тук."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Тр�бва да включите %s, за да �е по�в�т контакти тук."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Спи�ък � контакти"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "�а�тройки на реги�трациите"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "_Контакти на карта"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Кредит"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "_Тър�ене в �пи�ъка � контакти"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "_Добав�не към отметките"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Редактиране на отметките"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "_�ормален размер"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "�ов _разговор…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "�ормален размер � _аватари"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_�а�тройки"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "_Показване на протокола"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Подреждане по _име"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Подреждане по _�ъ�то�ние"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Реги�трации"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Блокирани контакти"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Стегнат режим"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Прехвърл�ни� на файлове"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
-msgstr "_При�ъедин�ване…"
+msgstr "_Влизане…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_�ов разговор…"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Изключени контакти"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Лични данни"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "_Ста�"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_Тър�ене на контакти…"
 
@@ -4231,7 +4080,7 @@ msgstr "Уча�тници"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4244,19 +4093,24 @@ msgstr ""
 "Изи�ква �е парола: %s\n"
 "Брой уча�тници: %s"
 
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Да"
+
 # �алага �е � главни букви, защото „да“ �е използва в помощника за нови
 # реги�трации, където има и отговори под формата на пълни изречени� като
 # „�е, това е в�ичко за�ега“.
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�е"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Избро�ването на �таите не може да започне"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Избро�ването на �таите не може да �пре"
 
@@ -4291,79 +4145,79 @@ msgstr "Спи�ък �ъ� �таи"
 msgid "_Room:"
 msgstr "_Ста�:"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Съобщението е получено"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Съобщението е изпратено"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "�ов разговор"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Контактът е в мрежата"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Контактът влезе в мрежата"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Контактът е извън мрежата"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Реги�траци�та е включена"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Реги�траци�та е изключена"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Език"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Жулиета"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Ромео"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ромео! О, защо �и ти Ромео?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "От род и име отречи �е или"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "ако не щеш, любовна клетва дай ми"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "и аз не ще �ъм вече Капулети!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Да � отвърна ли или да �лушам?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Жулиета прекъ�на връзката"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "�а�тройки"
 
@@ -4423,35 +4277,27 @@ msgstr "Езици � проверка на правопи�а:"
 msgid "General"
 msgstr "Общи"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "�иво на вход�щи� звук:"
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Сила на вход�щи� звук:"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Датчик за ме�тоположение:"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "�рхив на разговорите"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Изве�т�ване"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "Звуци при �ъбити�"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "Лични данни"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4461,33 +4307,37 @@ msgstr ""
 "точни данни от град, щат, държава. Координатите от GPS ще �а точни до едно "
 "м��то зад де�етичната запета�."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Използване на _картинки за емотикони"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "_Показване на контактите в �таите"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Звуци"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Проверка на правопи�а"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "Започване на разговорите в: "
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "В �пи�ъка �а �амо езиците, за които е ин�талиран речник."
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "Графични теми"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr "Премахване на _ехото за по-добро каче�тво"
 
@@ -4495,47 +4345,51 @@ msgstr "Премахване на _ехото за по-добро качеÑ�Ñ‚Ð
 # дадената позици�.  От друга �трана, пеленг може би е прекалено т��но
 # терминологично в �ферата на мор�ката/въздушната навигаци�.
 # Пеленг �тава
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Пеленг:"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_�втоматично �вързване при �тартиране"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Мобилен телефон"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "Включване на изве�т�ването � _прозорци"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "Включване на уведом�ването �ъ� _звук"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Мрежа (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "_Отвар�не на разговорите в отделни прозорци"
-
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "_Публикуване на ме�тоположението ви към контактите ви"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "_�и�ка точно�т на ме�тоположението"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "нови _прозорци"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "нови по_дпрозорци"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Съ�то�ние"
@@ -4592,67 +4446,67 @@ msgstr "Включване на видеото"
 msgid "Video Preview"
 msgstr "Преглед на видеото"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Карта � контактите"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1585
 msgid "Save"
 msgstr "Запазване"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1761
 msgid "Debug Window"
 msgstr "Прозорец за изчи�тване на грешки"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1848
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:1860
 msgid "Level "
 msgstr "�иво"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1879
 msgid "Debug"
 msgstr "Подробно�т"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1884
 msgid "Info"
 msgstr "Информаци�"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:1889 ../src/empathy-debug-window.c:1935
 msgid "Message"
 msgstr "Съобщение"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1894
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:1899
 msgid "Critical"
 msgstr "Критична"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:1904
 msgid "Error"
 msgstr "Грешка"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:1923
 msgid "Time"
 msgstr "Време"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1926
 msgid "Domain"
 msgstr "Обла�т"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:1928
 msgid "Category"
 msgstr "Категори�"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:1930
 msgid "Level"
 msgstr "�иво"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:1953
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4660,103 +4514,98 @@ msgstr ""
 "Избраната програма за управление на връзките не поддържа разширението за "
 "отдалечено изчи�тване на грешки."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Поканване на уча�тник"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Избор на контакт, за поканване в разговора:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Покана"
 
-#: ../src/empathy-accounts.c:184
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Без показването на прозорци. Извършване на дейно�т (напр. вна��не) и �пиране"
 
-#: ../src/empathy-accounts.c:188
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Да не �е показват прозорци, о�вен ако в�ичките реги�трации �а за „Хора "
 "наблизо“"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Първоначално избиране на дадена реги�траци� (напр. gabble/jabber/"
 "foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:194
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<ид-р на реги�траци�>"
 
-#: ../src/empathy-accounts.c:197
-#, fuzzy
-msgid "Show account assistant"
-msgstr "Показване на кредита в �пи�ъка � контакти"
-
-#: ../src/empathy-accounts.c:203
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— Реги�трации на Empathy"
 
-#: ../src/empathy-accounts.c:242
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Реги�трации на Empathy"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Само избрана у�луга"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "— изчи�тване на грешки към Empathy"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Изчи�тване на грешки към Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "— моментни �ъобщени� � Empathy"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "Отговар�не"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1573
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Отхвърл�не"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1574
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1573
 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 "Въвеждане"
 
@@ -4767,66 +4616,76 @@ msgstr "%s току-що �е опита да ви позвъни, но пров
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1183 ../src/empathy-call-window.c:1206
+#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "инф."
 
-#: ../src/empathy-call-window.c:2890
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "Задържане"
 
-#: ../src/empathy-call-window.c:2893
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Без звук"
 
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Времетраене"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2898
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dм"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "Зачита_не на главни/малки"
-
-#~ msgid "Empathy has migrated butterfly logs"
-#~ msgstr "Empathy извърши миграци� на данните от butterfly"
-
-#~ msgid "Whether Empathy has migrated butterfly logs."
-#~ msgstr ""
-#~ "Дали програмата Empathy е извършила миграци� на данните от butterfly"
-
-#~ msgid "Ungrouped"
-#~ msgstr "Без група"
+#: ../src/empathy-call-window.c:3214
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Текущи�т ви балан� е %s."
 
-#~ msgid "Favorite People"
-#~ msgstr "Любими хора"
+#: ../src/empathy-call-window.c:3218
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "��мате до�татъчно кредит, за да извършите това обаждане."
 
-#~ msgid "Select a contact"
-#~ msgstr "Избор на контакт"
+#: ../src/empathy-call-window.c:3220
+msgid "Top Up"
+msgstr "Захранване"
 
-#~ msgid "The selected contact cannot receive files."
-#~ msgstr "Избрани�т контакт не може да получава файлове."
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "Зачита_не на главни/малки"
 
-#~ msgid "The selected contact is offline."
-#~ msgstr "Избрани�т контакт е извън мрежата"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Какъв вид реги�траци� имате?"
 
-#~ msgctxt "encoding video codec"
-#~ msgid "Unknown"
-#~ msgstr "�еизве�тно"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "�ова реги�траци�"
 
-#~ msgctxt "encoding audio codec"
-#~ msgid "Unknown"
-#~ msgstr "�еизве�тно"
+# FIXME: Това е връзка чрез mDNS/DNS-SD, �иреч Avahi.  „Хора наблизо“ е
+# до�та объркващо, защото контакти от локалната мрежа не е задължително
+# да �а наблизо, както и контакти от други мрежи може да �а �ъв�ем
+# наблизо.
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Хора наблизо"
 
-#~ msgctxt "decoding video codec"
-#~ msgid "Unknown"
-#~ msgstr "�еизве�тно"
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy може автоматично да открива и хората, които �а �вързани в �ъщата "
+"мрежа като ва�, и да започва разговор � т�х. �ко и�кате да ползвате тази "
+"възможно�т, проверете дали на�тройките отдолу �а верни."
 
-#~ msgctxt "decoding audio codec"
-#~ msgid "Unknown"
-#~ msgstr "�еизве�тно"
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Можете да промените тези на�тройки по-къ�но или изц�ло да изключите тези "
+"възможно�т като изберете <span style=\"italic\">Редактиране → Реги�трации</"
+"span> в �пи�ъка � контакти."
diff --git a/po/cs.po b/po/cs.po
index 1e5ef9308..447c07b89 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,21 +12,21 @@
 # Jiri Eischmann <jiri@eischmann.cz>, 2010.
 # Pavel Šefránek <pavel@sefranek2.cz>, 2011.
 # Petr Kovar <pknbe@volny.cz>, 2008, 2009, 2010, 2011.
-# Marek Černocký <marek@manet.cz>, 2010, 2011.
+# Marek Černocký <marek@manet.cz>, 2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-10-28 07:54+0000\n"
-"PO-Revision-Date: 2011-10-30 12:10+0100\n"
+"POT-Creation-Date: 2012-01-09 11:44+0000\n"
+"PO-Revision-Date: 2012-01-19 22:18+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Lokalize 1.2\n"
 
@@ -51,22 +51,14 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Pro nové konverzace vždy otevírat oddělená okna."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Hlasitost hovoru"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Hlasitost hovoru, v procentech."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "Zařízení kamery"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "Poloha kamery"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -74,62 +66,62 @@ msgstr ""
 "Znak, který má být přidán za přezdívku při použití doplňování přezdívek "
 "(tabulátorem) ve skupinové konverzaci."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "Motiv okna konverzace"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "Varianta motivu okna konverzace"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Čárkami oddělený seznam jazyků používaných ke kontrole pravopisu (např. „en, "
 "fr, nl“)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "Kompaktní seznam kontaktů"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "Měli byste používat správce připojení"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "Kritérium pro řazení seznamu kontaktů"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
 "Cesta objektu D-Bus pro ú�et, který byl vybrán jako poslední pro vstup do "
 "místnosti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "Výchozí zařízení kamery, které se má používat pro videohovory, např. /dev/"
 "video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "Výchozí adresář pro výběr obrázku avataru"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "Zakázat vyskakující upozornění v případě mé nepřítomnosti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "Zakázat zvuky v případě mé nepřítomnosti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "Zobrazovat příchozí události ve stavové oblasti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -137,244 +129,244 @@ msgstr ""
 "Zobrazovat příchozí události ve stavové oblasti. Když je něco špatně, tak se "
 "to uživatel ihned dozví."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "Podpora potla�ení ozvěny"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "Empathy může zveřejnit polohu uživatele"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy se může pokusit ur�it vaši polohu pomocí GPS"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy se může pokusit ur�it vaši polohu pomocí mobilní sítě"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy se může pokusit ur�it vaši polohu pomocí sítě"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Výchozí adresář pro stahování aplikace Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy by měl při ne�innosti automaticky nastavit na nepřítomen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "Automaticky připojovat Empathy po spuštění"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Přesnost plohy by měla být omezena"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Používat avatar kontaktu jako ikonku okna konverzace"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "Povolit vývojové nástroje pro WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "Povolit vyskakující upozornění na nové zprávy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "Povolit kontrolu pravopisu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "Skrýt hlavní okno"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "Skrýt hlavní okno."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Last account selected in Join Room dialog"
 msgstr "Poslední ú�et vybraný v dialogovém okně pro vstup do místnosti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Nick completed character"
 msgstr "Znak doplňování přezdívek"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Open new chats in separate windows"
 msgstr "Otevírat nové konverzace v oddělených oknech"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Path of the Adium theme to use"
 msgstr "Cesta k požadovanému motivu Adium"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Cesta k motivu Adium, který bude v případě, že Adium používáte, vybrán."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "Přehrávat zvuk pro příchozí zprávy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for new conversations"
 msgstr "Přehrát zvuk při nové konverzaci"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for outgoing messages"
 msgstr "Přehrávat zvuk pro odchozí zprávy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound when a contact logs in"
 msgstr "Přehrávat zvuk, když se kontakt přihlásí"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs out"
 msgstr "Přehrát zvuk, pokud se kontakt odhlásí"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when we log in"
 msgstr "Přehrávat zvuk, když se přihlásím"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log out"
 msgstr "Přehrávat zvuk, když se odhlásím"
 
 # is chat different than conversation?
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Vyskakující upozornění, pokud není vybrána konverzace"
 
 # is chat different than conversation?
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications when a contact logs in"
 msgstr "Vyskakující upozornění při přihlášení kontaktu"
 
 # is chat different than conversation?
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs out"
 msgstr "Vyskakující upozornění při odhlášení kontaktu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Position the camera preview should be during a call."
 msgstr "Poloha náhledové kamery, jak by měla být během hovoru."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Show Balance in contact list"
 msgstr "Zobrazovat zůstatek kreditu v seznamu kontaktů"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show avatars"
 msgstr "Zobrazovat avatary"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show contact list in rooms"
 msgstr "Zobrazit seznam kontaktů v diskuzních místnostech"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show hint about closing the main window"
 msgstr "Zobrazovat nápovědu, pokud se chystáte zavřít hlavní okno"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show offline contacts"
 msgstr "Zobrazovat odpojené kontakty"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show protocols"
 msgstr "Zobrazovat protokoly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Spell checking languages"
 msgstr "Jazyky s kontrolovaným pravopisem"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "The default folder to save file transfers in."
 msgstr "Výchozí adresář pro ukládání přenášených souborů."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Poslední adresář, ze kterého byl vybrán obrázek avataru."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The position for the chat window side pane"
 msgstr "Poloha pro postranní panel okna s konverzací"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Uložená poloha (v pixelech) postranního panelu okna s konverzací"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Motiv, který je používán pro zobrazení konverzací v oknech konverzací."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Motiv, který je používán pro zobrazení konverzací v oknech konverzací."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "Používat grafické smajlíky"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use notification sounds"
 msgstr "Používat zvuková upozornění"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use theme for chat rooms"
 msgstr "Používat motiv pro diskuzní místnosti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Jestli může Empathy zveřejňovat kontaktům vaši polohu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Jestli může Empathy používat GPS k ur�ení polohy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Jestli může Empathy použít mobilní síť k ur�ení polohy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Zda může Empathy použít sít k ur�ení polohy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Jestli se má Empathy po spuštění automaticky připojovat k vašim ú�tům."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Zda by měla aplikace Empathy při ne�innosti uživatele přepínat na stav "
 "nepřítomen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Jestli má Empathy omezit přesnost polohy pro lepší ochranu vašeho soukromí."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Zda má Empathy používat avatar kontaktu jako ikonu okna s konverzací."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Zda mají být povoleny vývojové nástroje pro Webkit, například Web Inspektor."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -382,69 +374,69 @@ msgstr ""
 "Jestli má být používán správce připojení k automatickému připojování a "
 "odpojování."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Jestli u zadávaných slov kontrolovat pravopis."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Jestli v konverzacích převádět smajlíky na obrázky."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Zda zapnout filtr Pulseaudio pro potla�ení ozvěny."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Jestli přehrávat zvuky jako upozornění na přihlašování kontaktu k síti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Jestli přehrávat zvuky jako upozornění na odhlašování kontaktu od sítě."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of events."
 msgstr "Jestli přehrávat zvuky jako upozornění na události."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Jestli přehrávat zvuk jako upozornění na příchozí zprávy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Jestli přehrávat zvuk jako upozornění na novou konverzaci."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Jestli přehrávat zvuk jako upozornění na odchozí zprávy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound when logging into a network."
 msgstr "Jestli přehrávat zvuk, když se přihlašuji do sítě."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Zda přehrávat zvuk, když se odhlašuji ze sítě."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Zda přehrávat zvuková upozornění v případě mé nepřítomnosti nebo "
 "zaneprázdněnosti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Jestli zobrazovat vyskakující upozornění při odpojení uživatele."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Jestli zobrazovat vyskakující upozornění při přihlášení kontaktu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -452,43 +444,43 @@ msgstr ""
 "Zdali zobrazovat vyskakující upozornění na novou zprávu, i když konverzace "
 "byla již otevřena, ale není vybrána."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Zdali zobrazovat vyskakující upozornění při přijetí nové zprávy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show account balances in the contact list."
 msgstr "Jestli zobrazovat zůstatek kreditu v seznamu kontaktů."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Zda zobrazovat avatary kontaktů v seznamu kontaktů a oknech s konverzacemi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Zda v seznamu kontaktů zobrazovat odpojené kontakty."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Zda zobrazovat vyskakující upozornění v případě mé nepřítomnosti nebo "
 "zaneprázdněnosti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Jestli zobrazovat protokoly kontaktů v seznamu kontaktů."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Jestli zobrazovat seznam kontaktů v diskuzních místnostech."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show the contact list in compact mode."
 msgstr "Jestli zobrazovat seznam kontaktů v kompaktním režimu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -496,11 +488,11 @@ msgstr ""
 "Zda zobrazovat varování při uzavírání hlavního okna prostřednictvím tla�ítka "
 "„x“ (křížek) v záhlaví okna."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to use the theme for chat rooms."
 msgstr "Zda používat motiv pro diskuzní místnosti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -516,23 +508,51 @@ msgstr "Spravovat ú�ty IM a VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2307
+#: ../src/empathy-accounts-dialog.c:2406
 msgid "Messaging and VoIP Accounts"
 msgstr "Ú�ty IM a VoIP"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Nebyl udán žádný důvod"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Byla vyžádána změna stavu"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Zrušili jste přenos souboru"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Protistrana zrušila přenos souboru"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Chyba při pokusu o odeslání souboru"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Protistrana není schopna přenosu souborů"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+msgid "Unknown reason"
+msgstr "Neznámý důvod"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Přenos souboru byl dokon�en, ale soubor byl poškozen"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Přenos souborů není podporován vzdálenou stranou"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Vybraný soubor není běžným souborem"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Vybraný soubor je prázdný"
 
@@ -552,171 +572,139 @@ msgstr "Hovor s kontaktem %s"
 msgid "Call from %s"
 msgstr "Příchozí hovor od kontaktu %s"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "Typ soketu není podporován"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "Nebyl udán žádný důvod"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "Byla vyžádána změna stavu"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "Zrušili jste přenos souboru"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "Protistrana zrušila přenos souboru"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "Chyba při pokusu o odeslání souboru"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "Protistrana není schopna přenosu souborů"
-
-#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Neznámý důvod"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:231
 msgid "Available"
 msgstr "Přítomen"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:233
 msgid "Busy"
 msgstr "Zaneprázdněn"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:236
 msgid "Away"
 msgstr "Nepřítomen"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:238
 msgid "Invisible"
 msgstr "Neviditelný"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:240
 msgid "Offline"
 msgstr "Odpojen"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:243
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznámo"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:283
 msgid "No reason specified"
 msgstr "Neudán žádný důvod"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
 msgid "Status is set to offline"
 msgstr "Stav nastaven na „Odhlášen“"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
 #: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Chyba sítě"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 msgid "Authentication failed"
-msgstr "Ověření selhalo"
+msgstr "Autentizace selhala"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Encryption error"
 msgstr "Chyba šifrování"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:293
 msgid "Name in use"
 msgstr "Jméno používáno"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
 msgid "Certificate not provided"
 msgstr "Certifikát nebyl poskytnut"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate untrusted"
 msgstr "Nedůvěryhodný certifikát"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate not activated"
 msgstr "Certifikát není aktivován"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate hostname mismatch"
 msgstr "Certifikát názvu po�íta�e nesouhlasí"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikát otisku prstu nesouhlasí"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate self-signed"
 msgstr "Certifikát je podepsán sám sebou"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:309
 msgid "Certificate error"
 msgstr "Chyba certifikátu"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:343
 msgid "Encryption is not available"
 msgstr "Šifrování není dostupné"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:345
 msgid "Certificate is invalid"
 msgstr "Certifikát je neplatný"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:347
 msgid "Connection has been refused"
 msgstr "Spojení bylo odmítnuto"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection can't be established"
 msgstr "Spojení nemohlo být navázáno"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection has been lost"
 msgstr "Spojení bylo ztraceno"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:353
 msgid "This resource is already connected to the server"
 msgstr "Zdroj je již připojen k serveru"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Spojení bylo nahrazeno novým spojením, které používá stejný zdroj"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:358
 msgid "The account already exists on the server"
 msgstr "Takový ú�et již na serveru existuje"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:360
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server je právě příliš zaneprázdněn na to, aby obsloužil spojení"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:362
 msgid "Certificate has been revoked"
 msgstr "Certifikát byl odvolán"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:364
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certifikát používá nepříliš bezpe�ný šifrovací algoritmus nebo je z "
 "kryptografického hlediska slabý"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:367
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -724,23 +712,23 @@ msgstr ""
 "Délka certifikátu serveru nebo délka zřetězených certifikátů serveru "
 "přesáhla omezení dané kryptografickou knihovnou"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:371
 msgid "Your software is too old"
 msgstr "Váš software je příliš zastaralý"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:530
 msgid "People Nearby"
 msgstr "Lidé v okolí"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:535
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:564
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:565
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
@@ -796,102 +784,74 @@ msgstr[2] "před %d měsíci"
 msgid "in the future"
 msgstr "v budoucnosti"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:659
+#: ../libempathy-gtk/empathy-account-chooser.c:688
 msgid "All accounts"
 msgstr "Všechny ú�ty"
 
-#: ../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 "Ú�et"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Heslo"
 
-#: ../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:763
+#: ../libempathy-gtk/empathy-account-widget.c:815
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "My Web Accounts"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Ú�et %s je upravován přes %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Ú�et %s nelze upravovat v aplikaci Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Spustit My Web Accounts"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Upravit %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
+#: ../libempathy-gtk/empathy-account-widget.c:1396
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Uživatelské jméno:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1708
 msgid "A_pply"
 msgstr "_Použít"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1737
 msgid "L_og in"
 msgstr "Přip_ojit"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1810
 msgid "This account already exists on the server"
 msgstr "Takový ú�et již existuje"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1814
 msgid "Create a new account on the server"
 msgstr "Vytvořit nový ú�et na serveru"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "_Zrušit"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2239
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2265
 #, c-format
 msgid "%s Account"
 msgstr "Ú�et služby %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2269
 msgid "New account"
 msgstr "Nový ú�et"
 
@@ -939,7 +899,7 @@ msgstr "Zapamatovat heslo"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "Zapamatovat heslo"
 
@@ -1265,7 +1225,7 @@ msgid "STUN Server:"
 msgstr "Server STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "Server:"
 
@@ -1371,40 +1331,40 @@ msgstr "Tento protokol nepodporuje tísňová volání"
 msgid "You don't have enough credit in order to place this call"
 msgstr "Nemáte dostate�ný kredit k provedení tohoto volání"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:705
 msgid "Failed to open private chat"
 msgstr "Nepovedlo se otevřít soukromou konverzaci"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "Tato konverzace toto téma nepodporuje"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "Nemáte oprávnění potřebná pro změnu tématu"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:970
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "„%s“ není platné ID kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1065
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: vymazat všechny zprávy z této konverzace"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <téma>: nastavit téma aktuální konverzace"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID místnosti>: vstoupit do nové místnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID místnosti>: vstoupit do nové místnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1412,23 +1372,23 @@ msgstr ""
 "/part [<ID místnosti>] [<důvod>]: opustit místnost, bez udání tu právě "
 "aktuální"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1082
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID kontaktu> [<zpráva>]: otevřít novou soukromou konverzaci"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID kontaktu> <zpráva>: otevřít novou soukromou konverzaci"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <přezdívka>: změnit svoji přezdívku na aktuálním serveru"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <zpráva>: zaslat zprávu AKCE do aktuální konverzace"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1094
 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 "
@@ -1438,11 +1398,11 @@ msgstr ""
 "posílání zpráv za�ínajících s „/“. Například: „/say /join je použito pro "
 "připojení do místnosti“"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID kontaktu>: zobrazit informace o kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1450,120 +1410,120 @@ msgstr ""
 "/help [<příkaz>]: vypsat seznam podporovaných příkazů. Pokud je zadán "
 "<příkaz>, vypsat jeho použití."
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1121
 #, c-format
 msgid "Usage: %s"
 msgstr "Použití: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1166
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1292
 msgid "Unknown command; see /help for the available commands"
 msgstr "Neznámý příkaz, pro výpis dostupných příkazů použijte /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1456
 msgid "insufficient balance to send message"
 msgstr "Nemáte dostate�ný kredit k poslání zprávy"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1537
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Chyba při odesílání zprávy „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
+#: ../libempathy-gtk/empathy-chat.c:1541
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Chyba při odesílání zprávy: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1468
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "nedostate�ný zůstatek k zaslání zprávy. <a href='%s'>Dobít.</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1508
 msgid "not capable"
 msgstr "není k dispozici"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1515
 msgid "offline"
 msgstr "odpojen"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1518
 msgid "invalid contact"
 msgstr "neplatný kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1521
 msgid "permission denied"
 msgstr "oprávnění odepřeno"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1524
 msgid "too long message"
 msgstr "příliš dlouhá zpráva"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1527
 msgid "not implemented"
 msgstr "neimplementováno"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1531
 msgid "unknown"
 msgstr "neznámý"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Téma:"
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1610
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Nastavit téma na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "No topic defined"
 msgstr "Nestanoveno žádné téma"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2125
 msgid "(No Suggestions)"
 msgstr "(Žádné návrhy)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2193
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Přidat „%s“ do slovníku"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2230
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Přidat „%s“ do slovníku %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2300
 msgid "Insert Smiley"
 msgstr "Vložit smajlíka"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
-#: ../libempathy-gtk/empathy-ui-utils.c:1843
+#: ../libempathy-gtk/empathy-chat.c:2318
+#: ../libempathy-gtk/empathy-ui-utils.c:1868
 msgid "_Send"
 msgstr "_Odeslat"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2373
+#: ../libempathy-gtk/empathy-chat.c:2375
 msgid "_Spelling Suggestions"
 msgstr "Návrhy pravopi_sných oprav"
 
-#: ../libempathy-gtk/empathy-chat.c:2462
+#: ../libempathy-gtk/empathy-chat.c:2464
 msgid "Failed to retrieve recent logs"
 msgstr "Nepovedlo se získat záznam nedávné historie"
 
-#: ../libempathy-gtk/empathy-chat.c:2599
+#: ../libempathy-gtk/empathy-chat.c:2601
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s se odpojil"
@@ -1571,12 +1531,12 @@ msgstr "%s se odpojil"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2608
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s byl vyhozen uživatelem %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2611
 #, c-format
 msgid "%s was kicked"
 msgstr "%s byl vyhozen"
@@ -1584,17 +1544,17 @@ msgstr "%s byl vyhozen"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2617
+#: ../libempathy-gtk/empathy-chat.c:2619
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s byl zakázán uživatelem %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2622
 #, c-format
 msgid "%s was banned"
 msgstr "%s byl zakázán"
 
-#: ../libempathy-gtk/empathy-chat.c:2624
+#: ../libempathy-gtk/empathy-chat.c:2626
 #, c-format
 msgid "%s has left the room"
 msgstr "%s opustil místnost"
@@ -1604,17 +1564,17 @@ msgstr "%s opustil místnost"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2633
+#: ../libempathy-gtk/empathy-chat.c:2635
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2658
+#: ../libempathy-gtk/empathy-chat.c:2660
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s se připojil do místnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:2683
+#: ../libempathy-gtk/empathy-chat.c:2685
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je te� znám jako %s"
@@ -1622,87 +1582,88 @@ msgstr "%s je te� znám jako %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2836
-#: ../src/empathy-streamed-media-window.c:1896
-#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1536
-#: ../src/empathy-call-window.c:1586 ../src/empathy-call-window.c:2632
+#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
 msgid "Disconnected"
 msgstr "Odpojen"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3482
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Would you like to store this password?"
 msgstr "Přejete si uchovat toto heslo?"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3498
 msgid "Remember"
 msgstr "Zapamatovat"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3508
 msgid "Not now"
 msgstr "Nyní ne"
 
-#: ../libempathy-gtk/empathy-chat.c:3542
+#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Opakovat"
 
-#: ../libempathy-gtk/empathy-chat.c:3546
+#: ../libempathy-gtk/empathy-chat.c:3556
 msgid "Wrong password; please try again:"
 msgstr "Špatné heslo, zkuste to prosím znovu:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3676
+#: ../libempathy-gtk/empathy-chat.c:3686
 msgid "This room is protected by a password:"
 msgstr "Tato místnost je chráněna heslem:"
 
-#: ../libempathy-gtk/empathy-chat.c:3703
+#: ../libempathy-gtk/empathy-chat.c:3713
 msgid "Join"
 msgstr "Připojit"
 
-#: ../libempathy-gtk/empathy-chat.c:3891 ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Připojen"
 
-#: ../libempathy-gtk/empathy-chat.c:3946
+#: ../libempathy-gtk/empathy-chat.c:3956
 msgid "Conversation"
 msgstr "Konverzace"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3951
+#: ../libempathy-gtk/empathy-chat.c:3961
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Neznámý nebo neplatný identifikátor"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokování kontaktů není do�asně k dispozici"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Blokování kontaktů není k dispozici"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Oprávnění odepřeno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Nelze blokovat kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:783
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Upravit blokované kontakty"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1441
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1720,56 +1681,51 @@ msgid "Remove"
 msgstr "Odstranit"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopírovat adresu odkazu"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Otevřít odkaz"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A, %e. %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Upravit informace o kontaktu"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
+#: ../libempathy-gtk/empathy-contact-dialogs.c:278
 msgid "Personal Information"
 msgstr "Osobní informace"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blokovat %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Opravdu chcete blokovat „%s“, aby vás znovu nekontaktoval?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokovat"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "Na_hlásit tento kontakt jako obtěžující"
@@ -1788,349 +1744,248 @@ msgstr "Požadavek na přihlášení"
 msgid "_Block User"
 msgstr "_Blokovat uživatele"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1935
-#: ../libempathy-gtk/empathy-individual-view.c:2375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Opravdu chcete odstranit skupinu „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1937
-#: ../libempathy-gtk/empathy-individual-view.c:2378
-msgid "Removing group"
-msgstr "Skupina  se odstraňuje"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
-msgid "_Remove"
-msgstr "_Odstranit"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2016
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Opravdu chcete odstranit kontakt „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2018
-#: ../libempathy-gtk/empathy-individual-view.c:2521
-msgid "Removing contact"
-msgstr "Kontakt se odstraňuje"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Přidat kontakt…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:292
-msgid "_Block Contact"
-msgstr "_Blokovat kontakt"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:321
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Diskuze"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:353
-#: ../libempathy-gtk/empathy-individual-menu.c:850
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audiohovor"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:386
-#: ../libempathy-gtk/empathy-individual-menu.c:895
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videohovor"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-individual-menu.c:948
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Předchozí konverzace"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:454
-#: ../libempathy-gtk/empathy-individual-menu.c:989
-msgid "Send File"
-msgstr "Odeslat soubor"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:477
-#: ../libempathy-gtk/empathy-individual-menu.c:1031
-msgid "Share My Desktop"
-msgstr "Sdílet moji plochu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:506
-#: ../libempathy-gtk/empathy-individual-menu.c:1094
-msgid "Infor_mation"
-msgstr "Infor_mace"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:552
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Upravit"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:606
-#: ../libempathy-gtk/empathy-individual-menu.c:1285
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Pozvání do místnosti"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:637
-#: ../libempathy-gtk/empathy-individual-menu.c:1331
-msgid "_Invite to Chat Room"
-msgstr "Pozvat do diskuzní místnost_i"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Hledat kontakty"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Hledat: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "Přid_at kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nenalezen žádný kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Vaše zpráva, kterou se představujete:"
 
-#: ../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 "Dejte mi prosím vědět, až budete připojen. Děkuji!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanály:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:797
-#: ../libempathy-gtk/empathy-individual-widget.c:421
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Kód země ISO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:799
-#: ../libempathy-gtk/empathy-individual-widget.c:423
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "ZemÄ›:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:801
-#: ../libempathy-gtk/empathy-individual-widget.c:425
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Kraj:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:803
-#: ../libempathy-gtk/empathy-individual-widget.c:427
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Město:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:805
-#: ../libempathy-gtk/empathy-individual-widget.c:429
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Oblast:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:807
-#: ../libempathy-gtk/empathy-individual-widget.c:431
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "PSČ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:809
-#: ../libempathy-gtk/empathy-individual-widget.c:433
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Ulice:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:811
-#: ../libempathy-gtk/empathy-individual-widget.c:435
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Budova:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:813
-#: ../libempathy-gtk/empathy-individual-widget.c:437
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Podlaží:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:815
-#: ../libempathy-gtk/empathy-individual-widget.c:439
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:817
-#: ../libempathy-gtk/empathy-individual-widget.c:441
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:819
-#: ../libempathy-gtk/empathy-individual-widget.c:443
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:821
-#: ../libempathy-gtk/empathy-individual-widget.c:445
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:823
-#: ../libempathy-gtk/empathy-individual-widget.c:447
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Úroveň přesnosti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:825
-#: ../libempathy-gtk/empathy-individual-widget.c:449
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Chyba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:827
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertikální chyba (v metrech):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:829
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horizontální chyba (v metrech):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:831
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Rychlost:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:833
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Azimut:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:835
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Rychlost stoupání:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:837
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Poslední aktualizace:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:839
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Zeměpisná délka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Zeměpisná šířka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:843
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Nadmořská výška:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:896
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:559
-#: ../libempathy-gtk/empathy-individual-widget.c:574
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "Poloha"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:576
+#: ../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:965
-#: ../libempathy-gtk/empathy-individual-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y v %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1047
-#: ../libempathy-gtk/empathy-individual-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Uložit avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1103
-#: ../libempathy-gtk/empathy-individual-widget.c:925
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Nelze uložit avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1787
-#: ../libempathy-gtk/empathy-individual-menu.c:1066
-#: ../libempathy-gtk/empathy-individual-widget.c:1324
-msgid "Favorite"
-msgstr "Oblíbený"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
 msgid "Phone number"
 msgstr "Telefonní �íslo"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
 msgid "E-mail address"
 msgstr "E-mailová adresa"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Website"
 msgstr "Webové stránky"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Birthday"
 msgstr "Narozeniny"
 
 #. Note to translators: this is the caption for a string of the form "5
 #. * minutes ago", and refers to the time since the contact last interacted
 #. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Last seen:"
 msgstr "Naposledy spatřen:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
 msgid "Connected from:"
 msgstr "Připojen z:"
 
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
 msgid "Away message:"
 msgstr "Zpráva v nepřítomnosti:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "work"
 msgstr "pracovní"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
 msgid "home"
 msgstr "domů"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
 msgid "mobile"
 msgstr "mobilní"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
 msgid "voice"
 msgstr "hlasový"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
 msgid "preferred"
 msgstr "upřednostňovaný"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
 msgid "postal"
 msgstr "poštovní"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
 msgid "parcel"
 msgstr "doru�ovací"
 
@@ -2140,7 +1995,7 @@ msgstr "<b>Poloha</b> (dne)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1260
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2160,7 +2015,7 @@ msgstr "Podrobnosti o kontaktu"
 #. 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:1469
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifikátor:"
 
@@ -2199,97 +2054,178 @@ msgid "Select"
 msgstr "Vybrat"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1967
+#: ../src/empathy-main-window.c:1949
 msgid "Group"
 msgstr "Skupina"
 
-#: ../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] "Následující identita bude blokována:"
 msgstr[1] "Následující identity budou blokovány:"
 msgstr[2] "Následující identity budou blokovány:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Následující identitu nelze blokovat:"
 msgstr[1] "Následující identity nelze blokovat:"
 msgstr[2] "Následující identity nelze blokovat:"
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Upravit informace o kontaktu"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Pospojované kontakty"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:370
+#: ../libempathy-gtk/empathy-individual-linker.c:372
 msgid "Select contacts to link"
 msgstr "Vyberte kontakty, které se mají pospojovat"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:444
+#: ../libempathy-gtk/empathy-individual-linker.c:447
 msgid "New contact preview"
 msgstr "Náhled nového kontaktu"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:488
+#: ../libempathy-gtk/empathy-individual-linker.c:491
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "Kontakty vybrané v seznamu na levé straně budou pospojovány dohromady."
 
 #. 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:181
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:363
 msgid "Select account to use to place the call"
 msgstr "Výběr ú�tu pro umístění volání"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:367
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1301
+#: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "Hovor"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:432
 msgid "Mobile"
 msgstr "Mobilní"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:434
 msgid "Work"
 msgstr "Pracovní"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:436
 msgid "HOME"
 msgstr "Soukromý"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:677
+msgid "_Block Contact"
+msgstr "_Blokovat kontakt"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-main-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "_Diskuze"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:805
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1143
+#: ../libempathy-gtk/empathy-individual-menu.c:1123
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audiohovor"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1156
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videohovor"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../src/empathy-main-window-menubar.ui.h:27
+msgid "_Previous Conversations"
+msgstr "_Předchozí konverzace"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
+msgid "Send File"
+msgstr "Odeslat soubor"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1256
+msgid "Share My Desktop"
+msgstr "Sdílet moji plochu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Oblíbený"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1310
+msgid "Infor_mation"
+msgstr "Infor_mace"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1359
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Upravit"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1169
+#: ../libempathy-gtk/empathy-individual-menu.c:1385
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "Po_spojovat kontakty…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-menu.c:1501
+#: ../src/empathy-chat-window.c:1011
+msgid "Inviting you to this room"
+msgstr "Pozvání do místnosti"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1547
+msgid "_Invite to Chat Room"
+msgstr "Pozvat do diskuzní místnost_i"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../src/empathy-main-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "_Přidat kontakt…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2355
 msgid "Delete and _Block"
 msgstr "Smazat a _blokovat"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2390
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Opravdu chcete odstranit skupinu „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2393
+msgid "Removing group"
+msgstr "Skupina  se odstraňuje"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2448
+#: ../libempathy-gtk/empathy-individual-view.c:2665
+msgid "_Remove"
+msgstr "_Odstranit"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2525
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Opravdu chcete odstranit kontakt „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2534
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2298,7 +2234,11 @@ msgstr ""
 "Opravdu chcete odstranit pospojovaný kontakt „%s“? Uvědomte si, že tím se "
 "odstraní všechny kontakty, které tento pospojovaný kontakt tvoří."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1608
+#: ../libempathy-gtk/empathy-individual-view.c:2546
+msgid "Removing contact"
+msgstr "Kontakt se odstraňuje"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2382,48 +2322,48 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Rozpojit"
 
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historie"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "Zobrazit"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "Hledat"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "Konverzace v místnosti %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "Konverzace s kontaktem %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"
@@ -2431,7 +2371,7 @@ msgstr[0] "%s sekunda"
 msgstr[1] "%s sekundy"
 msgstr[2] "%s sekund"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2439,80 +2379,80 @@ msgstr[0] "%s minuta"
 msgstr[1] "%s minuty"
 msgstr[2] "%s minut"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Hovor trval %s, skon�il %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "Dnes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "V�era"
 
 #. 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 "Kdykoli"
 
-#: ../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 "Kdokoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "Kdo"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "Kdy"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "Cokoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "Konverzace"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:3044
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "Příchozí hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "Odchozí hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "Zmeškané hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "Co"
 
-#: ../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 "Opravdu chcete vymazat všechny předchozí konverzace?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "Vymazat vše"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "Smazat z:"
 
@@ -2553,76 +2493,82 @@ msgstr "_Soubor"
 msgid "page 2"
 msgstr "strana 2"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Kontakt je odpojen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
 msgstr "Vybraný kontakt bu� není platný nebo je neznámý"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "Kontakt nepodporuje tento druh konverzace"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Požadovaná funkcionalita není pro tento protokol implementována"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "Nelze za�ít konverzaci s daným kontaktem"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "Na tomto kanálu máte zákaz"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "Tento kanál je plný"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
 msgstr "Abyste se mohl připojit k tomuto kanálu, musíte mít pozvání"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
 msgstr "Nelze pokra�ovat bez připojení"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
 msgstr "Oprávnění odepřeno"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
 msgstr "Při spouštění konverzace došlo k chybě"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
 msgid "Enter a contact identifier or phone number:"
 msgstr "Zadejte identifikátor kontaktu nebo telefonní �íslo:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Nová konverzace"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "_Video Call"
 msgstr "_Videohovor"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
 msgid "_Audio Call"
 msgstr "Hl_asový hovor"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "Nový hovor"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Autentizace selhala pro ú�et <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"
@@ -2833,19 +2779,19 @@ msgstr "Zapamatovat tuto volbu pro budoucí připojení"
 msgid "Certificate Details"
 msgstr "Podrobnosti certifikátu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1738
+#: ../libempathy-gtk/empathy-ui-utils.c:1742
 msgid "Unable to open URI"
 msgstr "Nelze otevřít URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1835
+#: ../libempathy-gtk/empathy-ui-utils.c:1860
 msgid "Select a file"
 msgstr "Vybrat soubor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1907
+#: ../libempathy-gtk/empathy-ui-utils.c:1935
 msgid "Insufficient free space to save file"
 msgstr "Nedostatek volného místa pro uložení souboru"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1915
+#: ../libempathy-gtk/empathy-ui-utils.c:1943
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2854,7 +2800,7 @@ msgstr ""
 "Pro uložení tohoto souboru je zapotřebí %s volného místa, ale k dispozici je "
 "jen %s. Zvolte prosím jiné umístění."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1959
+#: ../libempathy-gtk/empathy-ui-utils.c:1987
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Příchozí soubor od %s"
@@ -3026,31 +2972,31 @@ msgstr "západní"
 msgid "Vietnamese"
 msgstr "vietnamské"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Není dostupné chybové hlášení"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Rychlá zpráva (Empathy)"
 
-#: ../src/empathy.c:433
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "Nepřipojovat se po spuštění"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Nezobrazovat seznam kontaktů nebo žádné jiné dialogy po spuštění"
 
-#: ../src/empathy.c:452
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "– komunikátor Empathy"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "Chyba při kontaktování správce ú�tu"
 
-#: ../src/empathy.c:641
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3095,11 +3041,11 @@ msgstr ""
 "Empathy; pokud se tak nestalo, napište si o ni Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Klient rychlého zasílání zpráv pro pracovní prostředí GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Miloslav Trma� <mitr@volny.cz>\n"
@@ -3142,35 +3088,36 @@ msgstr ""
 "ukon�it a k přidat ú�et později prostřednictvím nabídky „Upravit“."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1274
 msgid "An error occurred"
 msgstr "Došlo k chybě"
 
-#: ../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 "Jaký typ ú�tu chcete vytvořit?"
 
-#: ../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 "Chcete založit ještě další ú�ty?"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "Zadejte podrobnosti svého ú�tu"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "Jaký typ ú�tu chcete vytvořit?"
 
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "Chcete vytvořit další ú�ty?"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "Zadejte podrobnosti nového ú�tu"
 
-#: ../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 "
@@ -3182,41 +3129,41 @@ msgstr ""
 "dalších komunikátorů. Pokud máte mikrofon a webovou kameru můžete se "
 "navzájem vidět a hovořit spolu."
 
-#: ../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 "Máte ú�et, který jste používali v jiném komunikátoru?"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "Ano, chci importovat ú�ty z programu "
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "Ano, zadám údaje svého ú�tu"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "Ne, chci vytvořit nový ú�et"
 
-#: ../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, momentálně chci vidět pouze lidi v sousedství"
 
-#: ../src/empathy-account-assistant.c:726
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "Vyberte ú�ty, které mají být importovány:"
 
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:631
+#: ../src/empathy-new-chatroom-dialog.c:632
 msgid "Yes"
 msgstr "Ano"
 
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "Ne, prozatím je to vše"
 
-#: ../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 "
@@ -3228,16 +3175,16 @@ msgstr ""
 "údaje jsou správné. Toto můžete kdykoli snadno změnit později, nebo tuto "
 "funkci vypnout v dialogu ú�tů."
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1150
 msgid "Edit->Accounts"
 msgstr "Upravit -> Ú�ty"
 
-#: ../src/empathy-account-assistant.c:1107
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
 msgstr "_Ne, pro te� nechci tuto funkci povolit"
 
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1146
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -3249,85 +3196,93 @@ msgstr ""
 "využívat, musíte mít nainstalován telepathy-salut a povolit funkci „Lidé v "
 "okolí“ v dialogovém okně ú�tů."
 
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1152
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut není nainstalován"
 
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1198
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Průvodce Ú�ty IM a VoIP"
 
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1232
 msgid "Welcome to Empathy"
 msgstr "Vítejte v Empathy"
 
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1241
 msgid "Import your existing accounts"
 msgstr "Importovat existující ú�ty"
 
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1259
 msgid "Please enter personal details"
 msgstr "Vložte prosím informace o své osobě"
 
 #. 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 "V ú�tu %s máte neuložené změny."
 
 #. 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 "Váš nový ú�et ještě není uložen."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1320
+#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
 msgid "Connecting…"
 msgstr "Probíhá připojování…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:393
 #, c-format
 msgid "Offline — %s"
 msgstr "Odpojen — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:405
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Odpojen — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Offline — No Network Connection"
 msgstr "Offline — Není k dispozici síť"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:423
 msgid "Unknown Status"
 msgstr "Neznámý stav"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:435
 msgid "Offline — Account Disabled"
 msgstr "Offline — Ú�et zakázán"
 
-#: ../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 ""
-"Chystáte se vytvořit nový ú�et, �ímž zrušíte\n"
-"provedené změny. Jste si jisti, že chcete pokra�ovat?"
+#: ../src/empathy-accounts-dialog.c:538
+msgid "Edit Connection Parameters"
+msgstr "Úprava parametrů připojení"
+
+#: ../src/empathy-accounts-dialog.c:701
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Selhalo získání vašich osobních informací ze serveru"
+
+#: ../src/empathy-accounts-dialog.c:707
+msgid "Go online to edit your personal information."
+msgstr "Jít upravovat své osobní informace on-line"
+
+#: ../src/empathy-accounts-dialog.c:792
+msgid "_Edit Connection Parameters..."
+msgstr "Upravit param_etry připojení…"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1293
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Opravdu chcete odstranit z vašeho po�íta�e „%s“?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1297
 msgid "This will not remove your account on the server."
 msgstr "Toto neodstraní váš ú�et na serveru."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1533
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3336,15 +3291,15 @@ msgstr ""
 "provedené změny. Jste si jisti, že chcete pokra�ovat?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1744
 msgid "_Enable"
 msgstr "_Povolit"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1745
 msgid "_Disable"
 msgstr "_Zakázat"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2255
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3380,13 +3335,13 @@ msgstr ""
 msgid "_Import…"
 msgstr "_Import…"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
-msgstr "– klient Empathy na ověření totožnosti"
+msgstr "– klient Empathy pro ověření totožnosti"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
-msgstr "Klient Empathy na ověření totožnosti"
+msgstr "Klient Empathy pro ověření totožnosti"
 
 #: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
@@ -3400,96 +3355,96 @@ msgstr "– audio/videoklient Empathy"
 msgid "Empathy Audio/Video Client"
 msgstr "Audio/videoklient Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Jas"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "Hlasitost"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "Po_straní lišta"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "Vstup zvuku"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "Vstup videa"
 
-#: ../src/empathy-streamed-media-window.c:1142
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "Tla�ítka vytá�ení"
 
-#: ../src/empathy-streamed-media-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "Podrobnosti"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1222
-#: ../src/empathy-call-window.c:1929
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
 #, c-format
 msgid "Call with %s"
 msgstr "Hovor s %s"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address as seen by the machine"
 msgstr "Adresa IP, jak ji vidí po�íta�"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2175
+#: ../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 "Adresa IP, jak ji vidí server v Internetu"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2177
+#: ../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 "Adresa IP vzájemného spojení, jak ji vidí druhá strana"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
 msgid "The IP address of a relay server"
 msgstr "Adresa IP přenosového serveru"
 
-#: ../src/empathy-streamed-media-window.c:1463
-#: ../src/empathy-call-window.c:2181
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
 msgid "The IP address of the multicast group"
 msgstr "Adresa IP vysílací skupiny"
 
-#: ../src/empathy-streamed-media-window.c:1845
-#: ../src/empathy-streamed-media-window.c:1848
-#: ../src/empathy-streamed-media-window.c:1851
-#: ../src/empathy-streamed-media-window.c:1854
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Neznámý"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2146
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Připojeno — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2207
-#: ../src/empathy-call-window.c:2984
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
 msgid "Technical Details"
 msgstr "Technické podrobnosti"
 
-#: ../src/empathy-streamed-media-window.c:2245
-#: ../src/empathy-call-window.c:3023
+#: ../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 "
@@ -3498,8 +3453,8 @@ msgstr ""
 "Software používaný kontaktem „%s“ nerozumí žádnému z formátů zvuku, který je "
 "podporován na vašem po�íta�i"
 
-#: ../src/empathy-streamed-media-window.c:2250
-#: ../src/empathy-call-window.c:3028
+#: ../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 "
@@ -3508,8 +3463,8 @@ msgstr ""
 "Software používaný kontaktem „%s“ nerozumí žádnému z formátů videa, který je "
 "podporován na vašem po�íta�i"
 
-#: ../src/empathy-streamed-media-window.c:2256
-#: ../src/empathy-call-window.c:3034
+#: ../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 "
@@ -3518,29 +3473,29 @@ msgstr ""
 "Nelze navázat spojení s %s. Někdo z vás není nejspíš v síti, která podporuje "
 "přímá spojení."
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3040
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
 msgid "There was a failure on the network"
 msgstr "Někde na síti došlo k selhání"
 
-#: ../src/empathy-streamed-media-window.c:2266
-#: ../src/empathy-call-window.c:3044
+#: ../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 ""
 "Nemáte nainstalovánu podporu žádného z formátů zvuku potřebného pro tento "
 "hovor"
 
-#: ../src/empathy-streamed-media-window.c:2269
-#: ../src/empathy-call-window.c:3047
+#: ../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 ""
 "Nemáte nainstalovánu podporu žádného z formátů videa potřebného pro tento "
 "hovor"
 
-#: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3059
+#: ../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"
@@ -3551,23 +3506,23 @@ msgstr ""
 "prosím tuto chybu</a> a přiložte chybové zprávy získané z odla�ovacího okna "
 "v nabídce „Nápověda“."
 
-#: ../src/empathy-streamed-media-window.c:2287
-#: ../src/empathy-call-window.c:3068
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
 msgid "There was a failure in the call engine"
 msgstr "Selhala funkce pro volání"
 
-#: ../src/empathy-streamed-media-window.c:2290
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
 msgid "The end of the stream was reached"
 msgstr "Byl dosažen konec proudu"
 
-#: ../src/empathy-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:3111
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
 msgid "Can't establish audio stream"
 msgstr "Nelze navázat spojení pro přenos zvuku"
 
-#: ../src/empathy-streamed-media-window.c:2340
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
 msgid "Can't establish video stream"
 msgstr "Nelze navázat spojení pro přenos obrazu"
 
@@ -3658,8 +3613,8 @@ msgstr "Přepnout vysílání obrazu"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2581 ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583 ../src/empathy-call-window.c:2584
+#: ../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 "Neznámo"
 
@@ -3829,96 +3784,96 @@ msgstr "Automaticky připojit"
 msgid "Manage Favorite Rooms"
 msgstr "Spravovat oblíbené místnosti"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "Příchozí videohovor"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1553
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "Příchozí hovor"
 
-#: ../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 "Volá vám %s, chcete to zvednout?"
 
-#: ../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 "Volá vám %s, chcete to zvednout?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1559
+#: ../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 "Příchozí hovor od %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "O_dmítnout"
 
-#: ../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 "_Zvednout"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "_Videohovor"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1559
+#: ../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 "Příchozí videohovor od %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "Pozvání do místnosti"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Pozvánka na připojení %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 vás zve do %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "O_dmítnout"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:860
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "Připo_jit"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vás pozval do %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Byli jste pozváni do %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Příchozí přenos souboru od %s"
 
-#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Požadováno heslo"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s by chtěl oprávnění vidět, když jste dostupný"
 
-#: ../src/empathy-event-manager.c:1214
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3928,105 +3883,105 @@ msgstr ""
 "Zpráva: %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 "Neznámo"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s z %s při %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s z %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Stahování „%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 "Odesílání „%s“ kontaktu %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 "Nastala chyba při stahování „%s“ od %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Chyba při přijímání souboru"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Chyba při odesílání „%s“ kontaktu %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Chyba při odesílání souboru"
 
 #. 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“ obdrženo od kontaktu %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“ odeslán kontaktu %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Přenos souboru byl dokon�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 "Čeká se na odpově� ostatních ú�astníků"
 
-#: ../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 "Ověřuje se neporušenost „%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 "Vytváří se kontrolní sou�et „%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 "Soubor"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Zbývá"
 
@@ -4051,73 +4006,73 @@ msgid "Import Accounts"
 msgstr "Import ú�tů"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
 msgstr "Import"
 
-#: ../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 "Zdroj"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "Poskytnout heslo"
 
-#: ../src/empathy-main-window.c:401
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Odpojit"
 
-#: ../src/empathy-main-window.c:642
+#: ../src/empathy-main-window.c:635
 msgid "No match found"
 msgstr "Nic nenalezeno"
 
-#: ../src/empathy-main-window.c:750
+#: ../src/empathy-main-window.c:743
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "Ú�et %s nemůže být bohužel použit, dokud nebude váš software %s aktualizován."
 
-#: ../src/empathy-main-window.c:818
+#: ../src/empathy-main-window.c:811
 msgid "Update software..."
 msgstr "Aktualizovat software…"
 
-#: ../src/empathy-main-window.c:824 ../src/empathy-main-window.c:949
+#: ../src/empathy-main-window.c:817 ../src/empathy-main-window.c:938
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../src/empathy-main-window.c:937
+#: ../src/empathy-main-window.c:926
 msgid "Reconnect"
 msgstr "Znovu připojit"
 
-#: ../src/empathy-main-window.c:943
+#: ../src/empathy-main-window.c:932
 msgid "Edit Account"
 msgstr "Upravit ú�et"
 
 #. Translators: this string will be something like:
 #. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1088
+#: ../src/empathy-main-window.c:1071
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Dobít kredit %s (%s)…"
 
-#: ../src/empathy-main-window.c:1135
+#: ../src/empathy-main-window.c:1118
 msgid "Top up account credit"
 msgstr "Dobít kredit ú�tu"
 
 #. top up button
-#: ../src/empathy-main-window.c:1206
+#: ../src/empathy-main-window.c:1189
 msgid "Top Up..."
 msgstr "Dobít kredit…"
 
-#: ../src/empathy-main-window.c:1949
+#: ../src/empathy-main-window.c:1931
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:2324
+#: ../src/empathy-main-window.c:2306
 msgid "Contact List"
 msgstr "Seznam kontaktů"
 
@@ -4220,7 +4175,7 @@ msgstr "Členové"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:629
 #, c-format
 msgid ""
 "%s\n"
@@ -4233,16 +4188,16 @@ msgstr ""
 "Je vyžadováno heslo: %s\n"
 "Členové: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:631
+#: ../src/empathy-new-chatroom-dialog.c:632
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:660
 msgid "Could not start room listing"
 msgstr "Nelze za�ít s výpisem místností"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:670
 msgid "Could not stop room listing"
 msgstr "Nelze skon�it s výpisem místností"
 
@@ -4277,79 +4232,79 @@ msgstr "Seznam místností"
 msgid "_Room:"
 msgstr "_Místnost:"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Zpráva přijata"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Nová konverzace"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:169
 msgid "Contact goes online"
 msgstr "Kontakt se připojil"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Kontakt se odpojil"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Ú�et připojen"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Ú�et odpojen"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Jazyk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:725
 msgid "Juliet"
 msgstr "Julie"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:732
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:738
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ach Romeo, Romeo! Pro� jsi Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:741
 msgid "Deny thy father and refuse thy name;"
 msgstr "Své jméno zapři, odřekni se otce,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:744
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "anebo, nechceš-li, zasvěť se mně,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:747
 msgid "And I'll no longer be a Capulet."
 msgstr "a přestanu být Kapuletová."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:750
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Mám ještě poslouchat? Či odpovím?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:753
 msgid "Juliet has disconnected"
 msgstr "Julie se odpojila"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1157
 msgid "Preferences"
 msgstr "Nastavení"
 
@@ -4410,35 +4365,27 @@ msgstr "Povolit kontrolu pravopisu pro jazyky:"
 msgid "General"
 msgstr "Všeobecné"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Úroveň vstupu:"
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Hlasitost vstupu:"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Zdroje polohy:"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "Zaznamenávat konverzace"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "Přehrávat zvuky při událostech"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "Soukromí"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4447,75 +4394,75 @@ msgstr ""
 "Při omezené přesnosti polohy bude zobrazen pouze stát, kraj a město. "
 "Souřadnice GPS budou zaokrouhleny na 1 desetinné místo."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Zobrazovat _smajlíky jako obrázky"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "_Zobrazit seznam kontaktů v místnostech"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Kontrola pravopisu"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Seznam jazyků obsahuje pouze jazyky, pro které máte nainstalovány slovníky."
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Motivy"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:28
 msgid "Use _echo cancellation to improve call quality"
 msgstr "Použít potla�_ení ozvěny ke zvýšení kvality volání"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:29
 msgid "Variant:"
 msgstr "Varianta:"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Automatically connect on startup"
 msgstr "Připojovat se _automaticky po spuštění "
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Cellphone"
 msgstr "_Mobil"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Enable bubble notifications"
 msgstr "P_ovolit bublinová upozornění"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable sound notifications"
 msgstr "_Povolit zvuková upozornění"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:34
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Síť (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Open new chats in separate windows"
 msgstr "_Otevírat nové diskuze v oddělených oknech"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "Zveřejnit _kontaktům polohu"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "O_mezit přesnost polohy"
 
@@ -4575,7 +4522,7 @@ msgstr "Video povoleno"
 msgid "Video Preview"
 msgstr "Náhled videa"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Zobrazení kontaktů na mapě"
 
@@ -4641,16 +4588,16 @@ msgid ""
 "extension."
 msgstr "Vybraný správce připojení nepodporuje rozšíření pro vzdálené ladění."
 
-#: ../src/empathy-invite-participant-dialog.c:197
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Přizvat ú�astníka"
 
-#: ../src/empathy-invite-participant-dialog.c:198
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Zvolte kontakt, který chcete přizvat do konverzace: "
 
-#: ../src/empathy-invite-participant-dialog.c:221
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Pozvat"
 
@@ -4703,39 +4650,39 @@ msgstr "Ladění Empathy"
 msgid "- Empathy Chat Client"
 msgstr "– komunika�ní klient Empathy"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "Odpovědět"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1563
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1565
 msgid "Reject"
 msgstr "Odmítnout"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1564
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1566
 msgid "Answer"
 msgstr "Zvednout"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
 msgid "Answer with video"
 msgstr "Videohovor"
 
-#: ../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 "Odmítnout"
 
-#: ../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 "Přijmout"
 
 #. 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 "Poskytnout"
 
@@ -4746,41 +4693,45 @@ msgstr "%s vám právě zkouší volat, ale vy máte jiný hovor."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1173 ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2880
+#: ../src/empathy-call-window.c:2929
 msgid "On hold"
 msgstr "Čeká na lince"
 
-#: ../src/empathy-call-window.c:2883
+#: ../src/empathy-call-window.c:2932
 msgid "Mute"
 msgstr "Ztišit"
 
-#: ../src/empathy-call-window.c:2885
+#: ../src/empathy-call-window.c:2934
 msgid "Duration"
 msgstr "Doba"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2888
+#: ../src/empathy-call-window.c:2937
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3207
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Váš aktuální zůstatek je %s."
 
-#: ../src/empathy-call-window.c:3162
+#: ../src/empathy-call-window.c:3211
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Pro toto volání nemáte bohužel dostate�ný kredit."
 
-#: ../src/empathy-call-window.c:3164
+#: ../src/empathy-call-window.c:3213
 msgid "Top Up"
 msgstr "Dobití kreditu"
 
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
-msgstr "Rozlišovat velikost _znaků"
\ No newline at end of file
+msgstr "Rozlišovat velikost _znaků"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Přidávání nového ú�tu"
diff --git a/po/da.po b/po/da.po
index 8bbb23479..2c2f5d578 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@
 # Ole Laursen <olau@hardworking.dk>, 2003, 04, 06.
 # David Nielsen <dnielsen@breakmygentoo.net>, 2002, 06.
 # M.P. Rommedahl <lhademmor@gmail.com>, 2008.
-# Kenneth Nielsen <k.nielsen81@gmail.com>, 2009-2011.
+# Kenneth Nielsen <k.nielsen81@gmail.com>, 2009-2012.
 # Ask Hjorth Larsen <asklarsen@gmail.com>, 2010.
 #
 # Konventioner:
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-16 13:32+0200\n"
-"PO-Revision-Date: 2011-09-16 13:41+0200\n"
+"POT-Creation-Date: 2012-02-20 22:56+0100\n"
+"PO-Revision-Date: 2012-02-19 19:32+0100\n"
 "Last-Translator: Kenneth Nielsen <k.nielsen81@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -53,27 +53,29 @@ msgstr "Samtaleklienten Empathy"
 msgid "IM Client"
 msgstr "IM-Klient"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Håndtér konti for meddelelser og VoIP"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "Konti for meddelelser og VoIP"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Ã…bn altid et separat chatvindue til nye chats."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Opkaldslydstyrke"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Opkaldslydstyrke, som en procentdel."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "Kameraenhed"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "Kameraposition"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -81,55 +83,61 @@ msgstr ""
 "Tegn som skal tilføjes efter kaldenavn når du bliver navnefuldførelse (tab) "
 "i gruppechat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "Tema for chatvindue"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "Temavariant for chatvindue"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Kommaadskilt liste af sprog, der skal bruges ved stavekontrol (f.eks. \"en, "
 "fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "Kompakt kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "Forbindelseshåndteringer bør bruges"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "Sorteringskriterium for kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"D-Bus-objektstien til den sidste konto, som blev valgt til at tilslutte et "
+"rum."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "Standardkameraenheden som skal bruges ved videoopkald, f.eks. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "Standardmappe at vælge profilbillede fra"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "Deaktivér pop op-påmindelse ved fravær"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "Deaktivér lyde ved fravær"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "Deaktiver indkommende begivenheder i statusområde"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -138,71 +146,75 @@ msgstr ""
 "brugeren med det samme hvis den er sat til falsk."
 
 # Der er en streng et andet sted som afslører at det er lydekko der menes
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "Understøttelse for neutralisering af ekko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "Empathy må offentliggøre brugerens placering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy må bruge GPS'en til at gætte placeringen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy må bruge mobilnetværket til at gætte placeringen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy må bruge netværket til at gætte placeringen"
 
 # Lidt klodset for at undgå at bruge download
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Standardmappe til hentede filer i Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy har konverteret butterfly-logge"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy skal automatisk sættes til fraværende ved inaktivitet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy skal autoforbinde ved start"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy skal reducere placeringens nøjagtighed"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy skal bruge kontaktens profilbillede som chattens vinduesikon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "Slå WebKit-udviklingsværktøjer til"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "Aktivér pop op-påmindelser for nye beskeder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "Aktivér stavekontrol"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "Skjul hovedvindue"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "Skjul hovedvinduet."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "Informér andre brugere om at du er ved at skrive til dem"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Last account selected in Join Room dialog"
+msgstr "Sidste konto som blev valgt i \"tilslut rum\"-dialogen"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Navnefuldførelsestegn"
@@ -272,87 +284,87 @@ msgid "Show avatars"
 msgstr "Vis profilbilleder"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "Vis kontaktgrupper"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Vis kontaktliste i rum"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Vis fif om lukning af hovedvinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "Vis offline kontakter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "Vis protokoller"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Stavekontrolleringssprog"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "Den forvalgte mappe at gemme filoverførsler i."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Den seneste mappe som et profilbillede blev valgt fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "Positionen af chatvinduets sidepanel"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Den gemte positionen (i billedpunkter) af chatvinduets sidepanel."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Det tema der bruges ved visning af samtalen i chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Den temavariant der bruges ved visning af samtalen i chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Benyt grafiske tekstansigter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Benyt påmindelseslyde"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Brug tema til chatrum"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Hvorvidt Empathy har lov til at offentliggøre brugerens placering overfor "
 "kontakterne."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Hvorvidt Empathy har lov til at bruge GPS til at gætte placeringen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Hvorvidt Empathy har lov til at bruge mobilnetværket til at gætte "
 "placeringen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 "Hvorvidt Empathy har lov til at bruge netværket til at gætte placeringen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Om Empathy har konverteret butterfly-logge."
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Om Empathy automatisk skal logge ind på dine konti ved opstart."
@@ -452,14 +464,22 @@ msgstr ""
 "travlt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Hvorvidt tilstandene \"skriver\" eller \"på pause\" skal sendes. Påvirker på "
+"nuværende tidspunkt ikke \"ikke til stede\"-tilstanden."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Om der skal vises pop op-påmindelser, når en kontakt logger af."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Om der skal vises pop op-påmindelser, når en kontakt logger på."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -467,46 +487,50 @@ msgstr ""
 "Om der skal vises en pop op-påmindelse ved modtagelse af en ny besked, selv "
 "hvis chatten allerede er åben, men ikke er fokuseret."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Om der skal vises en pop op-påmindelse ved modtagelse af en ny besked."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr "Hvorvidt der skal vises kontosaldi i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Om der skal vises profilbilleder for kontakter i kontaktlisten og "
 "chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Om kontakter der ikke er tilsluttet, skal vises i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr "Hvorvidt der skal vises grupper i kontaktlisten."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Om der skal vises pop op-påmindelser, når brugeren er fraværende eller har "
 "travlt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Om der skal vises profilbilleder for kontakter i kontaktlisten og "
 "chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Hvorvidt kontaktlisten skal vises i chatrum."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "Om kontaktlisten skal vises i kompakt form eller ej."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -514,43 +538,61 @@ msgstr ""
 "Om beskeddialogen om at lukke hovedvinduet med \"x\"-knappen i titelbjælken "
 "skal vises."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "Om temaet skal bruges til chatrum eller ej."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "Kriteriet der bruges til at sortere kontaktlisten. Som standard sorteres "
-"efter kontaktens navn med værdien \"name\". Værdien \"state\" vil sortere "
-"kontaktlisten efter status."
+"efter kontaktens status med værdien \"state\". Er værdien \"name\", sorteres "
+"efter kontaktens navn."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Håndtér konti for meddelelser og VoIP"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Ingen årsag blev angivet"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Konti for meddelelser og VoIP"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Ændringen i tilstand foregik på anmodning"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Du annullerede filoverførslen"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Den anden deltager annullerede filoverførslen"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Fejl ved forsøg på overførsel af filen"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Den anden deltager er ikke i stand til at overføre filen"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Ukendt årsag"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Filoverførsel fuldført, men filen blev beskadiget"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Filoverførsel understøttes ikke af fjernkontakten"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Den valgte fil er ikke en regulær fil"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Den valgte fil er tom"
 
@@ -570,173 +612,142 @@ msgstr "Ringede til %s"
 msgid "Call from %s"
 msgstr "Opkald fra %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Sokkeltype understøttet ikke"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Ingen årsag blev angivet"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Ændringen i tilstand foregik på anmodning"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Du annullerede filoverførslen"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Den anden deltager annullerede filoverførslen"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Fejl ved forsøg på overførsel af filen"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Den anden deltager er ikke i stand til at overføre filen"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "Ukendt årsag"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Tilgængelig"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Optaget"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Ikke til stede"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Offline"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ingen årsag angivet"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Status sat til offline"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Netværksfejl"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Godkendelse mislykkedes"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Krypteringsfejl"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Navn i brug"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Certifikat ikke givet"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certifikat utroværdigt"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certifikat udløbet"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certifikat ikke aktiveret"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Certifikat-værtsnavn passer ikke"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikat-fingeraftryk passer ikke"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certifikat selv-underskrevet"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Certifikatfejl"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgængelig"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Certifikatet er ugyldigt"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Tilslutningen er blevet afvist"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Forbindelsen kunne ikke etableres"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Forbindelsen blev brudt"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "Denne ressource er allerede forbundet til serveren"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Denne konto er allerede forbundet til serveren"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Forbindelse er blevet erstattet af en ny forbindelse, der bruger samme "
 "ressource"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Kontoen findes allerede på serveren"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Serveren har på nuværende tidspunkt for travlt til at håndtere forbindelsen"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Certifikatet er blevet tilbagekaldt"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certifikatet bruger en usikker krypteringsalgoritme eller er kryptografisk "
 "svag"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -744,165 +755,145 @@ msgstr ""
 "Længden af servercertifikatet, eller dybden af servercertifikatkæden, "
 "overskrider krypteringsbibliotekets grænser"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+# brugen af "software" fjernet behovet for at finde ud af om der henvises til et eller flere programmer
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Din software er for gammel"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Intern fejl"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Folk i nærheden"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-chat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minut siden"
 msgstr[1] "%d minutter siden"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dage siden"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d uge siden"
 msgstr[1] "%d uger siden"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "i fremtiden"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Alle Konti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Adgangskode"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Mine Webkonti"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Kontoen %s redigeres via %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Kontoen %s kan ikke redigeres i Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Start Mine Webkonti"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Redigér %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Brugernavn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "An_vend"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "L_og ind"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Denne konto findes allerede på serveren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Opret en ny konto på serveren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "_Annuller"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Ny konto"
 
@@ -950,7 +941,7 @@ msgstr "Husk adgangskode"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "Husk adgangskode"
 
@@ -1280,7 +1271,7 @@ msgid "STUN Server:"
 msgstr "STUN-server:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "Server:"
 
@@ -1324,36 +1315,36 @@ msgstr "Yahoo!-i_d:"
 msgid "_Room List locale:"
 msgstr "_Rumliste-placering:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Kunne ikke konvertere billede"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Ingen af de accepterede billedformater understøttes på dit system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "Kunne ikke gemme billede til fil"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Vælg dit profilbillede"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Tag et billede..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Intet billede"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Billeder"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Alle filer"
 
@@ -1362,7 +1353,7 @@ msgid "Click to enlarge"
 msgstr "Klik for at forstørre"
 
 #: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:62
 msgid "There was an error starting the call"
 msgstr "Der opstod en fejl ved opstart af opkaldet"
 
@@ -1382,40 +1373,44 @@ msgstr "Den angivne kontakt er ikke gyldig"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Nødopkald er ikke understøttet med denne protokol"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "Din saldo rækker ikke til at du kan foretage dette opkald"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Kunne ikke åbne privat chat"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Emne understøttes ikke af denne samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Du har ikke adgang til at ændre emnet"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� er ikke et gyldigt kontakt-id"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: Ryd alle meddelelser fra den aktuelle samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <emne>: Angiv emnet for den aktuelle samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id for chatrum>: GÃ¥ ind i et nyt chatrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id for chatrum>: GÃ¥ ind i et nyt chatrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1423,23 +1418,23 @@ msgstr ""
 "/part [<id for chatrum>] [<grund>]: Forlad chatrummet, som standard det "
 "nuværende chatrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontact-id> [<meddelelse>]: Ã…bn en privat chat"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakt-id> <meddelelse>: Ã…bn en privat chat"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kaldenavn>: Ændr dit kaldenavn på den aktuelle server"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <meddelelse>: Send en handlingsmeddelelse til den aktuelle samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1449,11 +1444,11 @@ msgstr ""
 "til at sende en meddelelse, der begynder med \"/\". For eksempel: \"/say /"
 "join-kommandoen bruges til at gå ind i et nyt chatrum\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-id>: viser information om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1461,113 +1456,126 @@ msgstr ""
 "/help [<kommando>]: Vis alle understøttede kommandoer. Hvis <kommando> er "
 "angivet, så vis dens brugsdokumentation."
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Brug: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Ukendt kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukendt kommando; brug /help for at se de tilgængelige kommandoer"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "for lille saldo til at sende beskeden"
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Fejl under afsendelse af besked \"%s\": %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Fejl under afsendelse af besked: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "utilstrækkelig saldo til at sende besked. <a href='%s'>Fyld op</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "ude af stand til"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "adgang nægtet"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "for lang besked"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "ikke implementeret"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "ukendt"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Fejl under afsendelse af besked \"%s\": %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Fejl under afsendelse af besked: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Emne sat til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Emne sat af %s til: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Intet emne defineret"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Tilføj \"%s\" til ordbog"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Tilføj \"%s\" til ordbogen for %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Indsæt tekstansigt"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Kunne ikke hente seneste logge"
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s er koblet af"
@@ -1575,12 +1583,12 @@ msgstr "%s er koblet af"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s blev sparket ud af %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s blev sparket ud"
@@ -1588,17 +1596,17 @@ msgstr "%s blev sparket ud"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s blev bortvist af %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s blev bortvist"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forladt rummet"
@@ -1608,17 +1616,17 @@ msgstr "%s har forladt rummet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s er kommet ind i rummet"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s har nu navnet %s"
@@ -1626,88 +1634,88 @@ msgstr "%s har nu navnet %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Ønsker du at gemme denne adgangskode?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Husk"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Ikke nu"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Prøv igen"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Forkert adgangskode; prøv venligst igen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Dette rum beskyttes af en adgangskode:"
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Deltag"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Samtale"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Ukendt eller ugyldig identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokering af kontakter er midlertidigt ikke tilgængelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Blokering af kontakter er ikke tilgængelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Adgang nægtet"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Kunne ikke blokere kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Redigér blokerede kontakter"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1719,64 +1727,55 @@ msgstr "Blokerede kontakter"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Fjern"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopiér linkadresse"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Ã…bn link"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Redigér kontaktoplysninger"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Personlige oplysninger"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Bloker %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Er du sikker på at du ønsker at blokere \"%s\", så vedkommende ikke kan "
 "kontakte dig igen?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokér"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Indrapportér denne kontakt som værende grov"
@@ -1794,349 +1793,268 @@ msgstr "Abonneringsanmodning"
 msgid "_Block User"
 msgstr "_Blokér bruger"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Ikke grupperet"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Favoritfolk"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Ønsker du at fjerne gruppen \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Fjerner gruppe"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Fjern"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Ønsker du at fjerne kontakten \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Fjerner kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Tilføj kontakt…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Blokér kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Chat"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Lydopkald"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videoopkald"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Tidligere samtaler"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Send fil"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Del mit skrivebord"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Favorit"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Opl_ysninger"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Redigér"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Inviterer dig til dette rum"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "_Invitér til chatrum"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Søg i kontakter"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Søg: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Tilføj kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Ingen kontakter fundet"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Besked til introduktion af dig selv:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Lad mig venligst se hvornår du er online. Tak!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Vælg en kontakt"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Fulde navn:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Telefonnummer:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-mail-adresse:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Webside:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Fødselsdag:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Sidst set:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Tilsluttet fra:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Fraværsbesked:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Lands ISO-kode:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Land:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Tilstand:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "By:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Postnummer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Gade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Bygning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Etage:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Niveau for nøjagtighed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Fejl:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Lodret fejl (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Vandret fejl (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Hastighed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Kurs:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Stigningshastighed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Sidst opdateret den:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Længdegrad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Breddegrad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Højde:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "Placering"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e. %B, %Y klokken %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Gem profilbillede"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Kan ikke gemme profilbillede"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personlige detaljer"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "Detaljer om kontakt"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Fulde navn"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-mail-adresse"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Webside"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Fødselsdag"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Sidst set:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Tilsluttet fra:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Fraværsbesked:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "arbejde"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "hjemme"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobil"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "taleopkald"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "foretrukne"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "post"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "pakke"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Placering</b> den (dato)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2148,15 +2066,10 @@ msgstr "Klientoplysninger"
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Detaljer om kontakt"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifikator:"
 
@@ -2173,11 +2086,11 @@ msgstr "Styresystem:"
 msgid "Version:"
 msgstr "Version:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2185,105 +2098,171 @@ msgstr ""
 "Vælg de grupper, som du ønsker at denne skal fremgå i. Bemærk at du kan "
 "vælge mere end en gruppe eller slet ingen gruppe."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Tilf_øj gruppe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Vælg"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Følgende identitet vil blive blokeret:"
 msgstr[1] "Følgende identiteter vil blive blokeret:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Følgende identitet kan ikke blokeres:"
 msgstr[1] "Følgende identiteter kan ikke blokeres:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Sammenkædede kontakter"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Vælg kontakter som skal sammenkædes"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Forhåndsvisning af ny kontakt"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "De valgte kontakter i listen til venstre vil blive sammenkædet."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Redigér kontaktoplysninger"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Vælg konto der skal bruges til at lave dette opkald"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "Opkald"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Arbejde"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "HJEM"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Blokér kontakt"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "_Chat"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Lydopkald"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videoopkald"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "_Previous Conversations"
+msgstr "_Tidligere samtaler"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Send fil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Del mit skrivebord"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favorit"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts er ikke installeret"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Installér venligst gnome-contacts for at kunne tilgå detaljer for kontakt."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Opl_ysninger"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Redigér"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Sammenkæd kontakter…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Inviterer dig til dette rum"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Invitér til chatrum"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "_Tilføj kontakt…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Slet og _blokér"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Ønsker du at fjerne gruppen \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Fjerner gruppe"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Fjern"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Ønsker du at fjerne kontakten \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2292,7 +2271,11 @@ msgstr ""
 "Ønsker du virklig at fjerne denne sammenkædede kontakt \"%s\"? Bemærk at "
 "dette vil fjerne alle de kontakter, som denne sammenkædede kontakt består af."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Fjerner kontakt"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2307,19 +2290,19 @@ msgstr "<b>Placering</b> den (dato)"
 msgid "Online from a phone or mobile device"
 msgstr "Via nettet fra en telefon eller mobil enhed"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nyt netværk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Vælg et IRC-netværk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Nulstil _netværksliste"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Vælg"
@@ -2332,182 +2315,136 @@ msgstr "ny server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Sammenkæd kontakter"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Adskil…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Split den valgte sammenkædede kontakt fuldstændigt op i de kontakter den "
-"indeholder."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Sammenkæd"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Adskil sammenkædet kontakt \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Er du sikker på at du vil adskille disse sammenkædede kontakter? Dette vil "
-"splitte de sammenkædede kontakter fuldstændigt op i de kontakter de består "
-"af."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Adskil"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historik"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "Vis"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "Søg"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "Chat i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat med %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekund"
 msgstr[1] "%s sekunder"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minut"
 msgstr[1] "%s minutter"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Opkaldet tog %s, sluttede %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "I dag"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "I går"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
 #: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "NÃ¥r som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "Hvem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "Hvornår"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "Hvad som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "Tekstchat"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3044
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Opkald"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "Indkommende opkald"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "Udgående opkald"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "Mistede opkald"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "Hvad"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Er du sikker på at du ønsker at slette alle logge fra tidligere samtaler?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "Ryd alle"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "Slet fra:"
 
@@ -2536,7 +2473,7 @@ msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "_Redigér"
 
@@ -2548,36 +2485,83 @@ msgstr "_Fil"
 msgid "page 2"
 msgstr "side 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Kontakt-id:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Kontakten er offline"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "C_hat"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Den angivne kontakt er enten ugyldig eller ukendt"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontakten understøtter ikke denne form for samtale"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr ""
+"Den forespurgte funktionalitet er ikke implementeret for denne protokol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Kunne ikke starte en samtale med den givne kontakt"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Du er bortvist fra denne kanal"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Kanalen er fuld"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Du skal inviteres, før du kan deltage i denne kanal"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Kan ikke fortsætte i afkoblet tilstand"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Adgang nægtet"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Der opstod en fejl ved opstart af samtalen"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "Indtast identifikator for kontakt eller telefonnummer:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Ny samtale"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Send _video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "_Videoopkald"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Opkald"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "_Lydopkald"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "Nyt opkald"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Godkendelse mislykkedes for kontoen <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2614,12 +2598,8 @@ msgstr "Klik for at gøre denne status til en favorit"
 msgid "Set status"
 msgstr "Sæt status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Sæt din tilstedeværelse og status"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Tilpassede beskeder…"
 
@@ -2696,12 +2676,12 @@ msgstr "Stemmeopkald sluttede"
 msgid "Edit Custom Messages"
 msgstr "Redigér tilpasset besked"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Besked redigeret %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2779,34 +2759,38 @@ msgid "Certificate hostname: %s"
 msgstr "Certifikat-værtsnavn: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Fortsæt"
+msgid "C_ontinue"
+msgstr "F_ortsæt"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Ikke-betroet forbindelse"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Forbindelsen er ikke betroet. Vil du fortsætte alligevel?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Husk dette valg til fremtidige forbindelser"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Certifikatdetaljer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Kan ikke åbne URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Vælg en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Ikke nok fri plads til at gemme filen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2815,7 +2799,7 @@ msgstr ""
 "%s fri plads er nødvendig for at gemme denne fil, men der er kun %s "
 "tilgængelig. Vælg venligst en anden placering."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Indkommende fil fra %s"
@@ -2987,39 +2971,31 @@ msgstr "Vestligt"
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Den valgte kontakt kan ikke modtage filer."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Den valgte kontakt er offline."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Ingen fejlmeddelelse"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Chatbesked (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "Tilslut ikke ved start"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Vis ikke kontaktlisten eller nogen andre dialoger ved opstart"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM-klient"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "Fejl ved forsøg på at kontakte kontohåndteringen"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3066,11 +3042,11 @@ msgstr ""
 "program. Hvis ikke, så skriv til Free software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "En samtaleklient til GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Ole Laursen\n"
@@ -3081,223 +3057,73 @@ msgstr ""
 "Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
 "Mere info: http://www.dansk-gruppen.dk"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Der opstod en fejl ved import af kontiene."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Der opstod en fejl ved fortolkning af detaljer for kontoen."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Der opstod en fejl under oprettelse af kontoen."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Der opstod en fejl."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Fejlmeddelelsen var: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Du kan enten gå tilbage og forsøge at indtaste dine kontodetaljer igen, "
-"eller afslutte denne assistent og tilføje konti senere fra Redigér-menuen."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Der opstod en fejl"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Hvilken type chatkonto ønsker du?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Har du andre chatkonti, du vil have indstillet?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Indtast dine kontodetaljer"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Hvilken type konto ønsker du at oprette?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Ønsker du at oprette andre chatkonti?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Indtast detaljerne for den nye konto"
-
-# Jeg tror lige vi ændrer formuleringen lidt frit, eftersom jeg ikke forstår hvad de taler om
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Med Empathy kan du chatte med folk på nettet, f.eks. venner og kolleger som "
-"bruger Google Talk, AIM, Windows Live eller mange andre chatprogrammer. Med "
-"en mikrofon eller et webkamera kan du også foretage lyd- eller videoopkald."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Har du en konto, som du har brugt med et andet chatprogram?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Ja, importér mine kontodetaljer fra "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Ja, jeg vil indtaste mine kontodetaljer nu"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Nej, jeg vil oprette en ny konto"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr ""
-"Nej, jeg vil bare tale med folk, der er tilsluttet i nærheden, indtil videre"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Vælg de konti, du vil importere:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Ja"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Nej, det var alt - indtil videre"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy kan automatisk finde og skrive til brugere, der er sluttet til samme "
-"netværk som dig. Hvis du vil bruge denne funktion, så kontrollér at "
-"detaljerne herunder er korrekte. Du kan let ændre disse detaljer senere, "
-"eller deaktivere denne funktion i dialogvinduet \"Konti\""
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Redigér->Konti"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Jeg vil _ikke aktivere denne funktion indtil videre"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Du vil ikke kunne skrive sammen med brugere, der er tilsluttet dit lokale "
-"netværk, da telepathy-salut ikke er installeret. Hvis du vil aktivere denne "
-"funktion, så installér venligst pakken telepathy-salut og opret en \"Folk i "
-"nærheden\"-konto fra dialogvinduet \"Konti\""
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut er ikke installeret"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Assistent for meddelelser og VoIP-konti"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Velkommen til Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importér dine eksisterende konti"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Indtast venligst personlige detaljer"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:71
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Der er ugemte ændringer til din %s-konto."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:75
 msgid "Your new account has not been saved yet."
 msgstr "Din nye konto er ikke blevet gemt endnu."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:347
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Forbinder…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "Ikke tilsluttet — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Frakoblet — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "Ikke tilsluttet — Ingen netværksforbindelse"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "Ukendt årsag"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
 msgstr "Ikke tilsluttet — Konto deaktiveret"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Du er ved at oprette en ny konto, hvilket vil kassere\n"
-"dine ændringer. Er du sikker på, at du vil fortsætte?"
+#: ../src/empathy-accounts-dialog.c:533
+msgid "Edit Connection Parameters"
+msgstr "Redigér forbindelsesparametre"
+
+#: ../src/empathy-accounts-dialog.c:696
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Kunne ikke hente din personlige information fra serveren."
+
+#: ../src/empathy-accounts-dialog.c:702
+msgid "Go online to edit your personal information."
+msgstr "Gå på nettet for at redigere din personlige information."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:787
+msgid "_Edit Connection Parameters..."
+msgstr "_Redigér forbindelsesparametre..."
+
+#: ../src/empathy-accounts-dialog.c:1283
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ønsker du at fjerne %s fra din computer?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1287
 msgid "This will not remove your account on the server."
 msgstr "Dette vil ikke fjerne din konto på serveren."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3306,15 +3132,23 @@ msgstr ""
 "ændringer. Er du sikker på, at du vil fortsætte?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "_Aktivér"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "_Deaktivér"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Spring over"
+
+#: ../src/empathy-accounts-dialog.c:2087
+msgid "_Connect"
+msgstr "_Tilslut"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3331,14 +3165,10 @@ msgid "Loading account information"
 msgstr "Indlæser kontaktoplysninger"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Ingen protokol installeret"
+msgid "No protocol backends installed"
+msgstr "Ingen protokolmoduler installeret"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokol:"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3356,132 +3186,116 @@ msgstr ""
 #  _("Import"), cell,
 #  "active", COL_IMPORT,
 #  NULL); 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "_Importér…"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Audio/video-klienten Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Audio/video-klienten Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Folk i nærheden"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr "- Audio/video-klienten Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Audio/video-klienten Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Lysstyrke"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "Lydstyrke"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "_Sidepanel"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "Lydinput"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "Videoinput"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "Opkaldspanel"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "Detaljer"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1782
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Opkald til %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "IP-adressen som den ses af maskinen"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adressen som den ses af en server på internettet"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adressen for modparten(peer), som den ses på den anden side"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "IP-adressen for en videresendelsesserver"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "IP-adressen for multicastgruppen"
 
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Ukendt"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Forbundet — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Tekniske detaljer"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3489,8 +3303,8 @@ msgid ""
 msgstr ""
 "%ss software forstår ingen af de lydformater, din computer understøtter"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3498,8 +3312,8 @@ msgid ""
 msgstr ""
 "%ss software forstår ingen af de videoformater, din computer understøtter"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3508,29 +3322,29 @@ msgstr ""
 "Kan ikke oprette forbindelse til %s. En af jer er måske på et netværk, der "
 "ikke tillader direkte forbindelser."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "Der opstod en fejl på netværket"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3100
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Lydformaterne, der kræves til dette opkald, er ikke installeret på din "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3103
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Videoformaterne, der kræves til dette opkald, er ikke installeret på din "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3541,23 +3355,23 @@ msgstr ""
 "a> venligst denne fejl og vedhæft logfiler fra fejlfindingsvinduet i menuen "
 "Hjælp."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "Der opstod en fejl i opkaldsmotoren"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "Afslutningen af strømmen blev nået"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "Kan ikke oprette lydstrøm"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "Kan ikke oprette videostrøm"
 
@@ -3648,8 +3462,8 @@ msgstr "Slå videotransmission til/fra"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
 msgid "Unknown"
 msgstr "Ukendt"
 
@@ -3667,17 +3481,17 @@ msgid "_Camera"
 msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_Indhold"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_Fejlfind"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "_Hjælp"
 
@@ -3690,51 +3504,100 @@ msgid "_Settings"
 msgstr "_Indstillinger"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Luk dette vindue?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Lukkes dette vindue, vil du forlade %s. Du vil ikke modtage yderligere "
+"beskeder, før du igen deltager."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Lukkes dette vindue vil du forlade et chatrum. Du vil ikke modtage "
+"yderligere beskeder før du igen deltager."
+msgstr[1] ""
+"Lukkes dette vindue vil du forlade %u chatrum. Du vil ikke modtage "
+"yderligere beskeder før du igen deltager."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Forlad %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Du vil ikke modtage yderligere beskeder fra dette chatrum, før du igen "
+"deltager i det."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Luk vindue"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Forlad rum"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ulæst)"
 msgstr[1] "%s (%d ulæste)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (og %u anden)"
 msgstr[1] "%s (og %u andre)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ulæst fra andre)"
 msgstr[1] "%s (%d ulæste fra andre)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d ulæst fra alle)"
 msgstr[1] "%s (%d ulæste fra alle)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sender %d besked"
 msgstr[1] "Sender %d beskeder"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Skriver en besked."
 
@@ -3814,96 +3677,96 @@ msgstr "Auto-tilslut"
 msgid "Manage Favorite Rooms"
 msgstr "Håndtér yndlingsrum"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "Indkommende videoopkald"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "Indkommende opkald"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s foretager et videoopkald til dig! Ønsker du at besvare opkaldet?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ringer til dig! Ønsker du at besvare opkaldet?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Indkommende opkald fra %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "Af_vis"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "_Besvar"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "_Besvar med video"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Indkommende videoopkald fra %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "Ruminvitation"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitation til at deltage i %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer dig til at slutte dig til %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "_Afslå"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:860
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Deltag"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s inviterer dig til at deltage i %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Du er blevet inviteret til at deltage i %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Indkommende filoverførsel fra %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Adgangskode påkrævet"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ønsker tilladelse til at se, når du er på nettet"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3913,105 +3776,105 @@ msgstr ""
 "Besked: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s af %s med %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s af %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Modtager \"%s\" fra %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Sender \"%s\" til %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Fejl ved modtagelse af \"%s\" fra %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Fejl ved modtagelse af fil"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Fejl ved afsendelse af \"%s\" til %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Fejl ved afsendelse af en fil"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" modtaget fra %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" sendt til %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Filoverførsel fuldført"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Venter på den anden deltagers svar"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Kontrollerer integritet af \"%s\""
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hasher \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Fil"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Tilbage"
 
@@ -4024,7 +3887,21 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Fjern færdiggjorte, annullerede eller fejlslagne filoverførsler fra listen"
 
-#: ../src/empathy-import-dialog.c:84
+# Fejlrapport, (v) eller (s)
+#
+# Kode omkring streng antyder at det er verbum bydeform
+#
+#  /* Import column */
+#  cell = gtk_cell_renderer_toggle_new ();
+#  gtk_tree_view_insert_column_with_attributes (view, -1,
+#  _("Import"), cell,
+#  "active", COL_IMPORT,
+#  NULL); 
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importer"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4032,7 +3909,7 @@ msgstr ""
 "Ingen konti kunne findes til import. Empathy understøtter på nuværende "
 "tidspunkt kun at importere konti fra Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importér konti"
 
@@ -4047,167 +3924,193 @@ msgstr "Importér konti"
 #  "active", COL_IMPORT,
 #  NULL); 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Import"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Giv adgangskode"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Frakobl"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Du skal oprette en konto for at se kontakter her."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ingen træffere fundet"
 
-#: ../src/empathy-main-window.c:777
+# Kildekoden antyder at begge %s er protokoller
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Beklager, %s-konti kan ikke benyttes før din %s-software er blevet opdateret."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Updatér software..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Luk"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Tilslut igen"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Redigér kontoen"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Luk"
-
 # Dette er vist ikke helt efter den engelske definition som er noget med at fylde op til et bestemt niveau, men jeg synes heller ikke at udtrykket "at toppe op" har udbredelse nok til at man kan bruge det. Forslag modtages gerne.
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Fyld op %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Fyld kontosaldo op"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Fyld op..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Du skal aktivere en af dine konti for at kunne se kontakter her."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Du skal aktivere %s for at kunne se kontakter her."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Kontoindstillinger"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Kontakter på et _kort"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Kreditsaldo"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Find i kontakt_liste"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "_Tilslut til favoritter"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "HÃ¥ndter favoritter"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "N_ormal størrelse"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nyt _opkald…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Normal størrelse med _profilbillede"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Indstillinger"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Vis _protokoller"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Sortér efter _navn"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Sortér efter s_tatus"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Konti"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokerede kontakter"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Kompakt størrelse"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Filoverførsler"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Deltag…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Ny samtale…"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Offline kontakter"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personlige oplysninger"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "R_um"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_Søg efter kontakter…"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Chatrum"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Medlemmer"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4220,16 +4123,21 @@ msgstr ""
 "Kræver adgangskode: %s\n"
 "Deltagere: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nej"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Kunne ikke starte fremvisning af rumliste"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Kunne ikke standse fremvisning af rumliste"
 
@@ -4264,84 +4172,84 @@ msgstr "Rumliste"
 msgid "_Room:"
 msgstr "R_um:"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Besked modtaget"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Besked sendt"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Ny samtale"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Kontakten logger på"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "En kontakt logger på"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
-msgstr "Kontakten logger af"
+msgstr "En kontakten logger af"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Konto tilsluttet"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Konto frakoblet"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Sprog"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julie"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ã…, Romeo, hvorfor er du Romeo?"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Fornægt din far, forkast det navn du bærer!"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Og vil du ikke, sværg så, du er min,"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "så er jeg ikke mer en Capulet!"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Skal jeg nu høre mere eller tale?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julie er koblet af"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Indstillinger"
 
@@ -4401,35 +4309,27 @@ msgstr "Aktivér stavekontrol for sprog:"
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Inputniveau:"
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Inputlydstyrke:"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Stedkilder:"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "Log samtaler"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "PÃ¥mindelser"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "Afspil lyde ved begivenheder"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "Privatliv"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4439,33 +4339,41 @@ msgstr ""
 "end din by, stat eller land vil blive vist. GPS-koordinater vil blive "
 "begrænset til første decimal."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Vis _smileys som billeder"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "Vis kontakt_liste i rum"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Lyde"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Stavekontrol"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "Start chat:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Denne liste indeholder kun sprog, som du har en ordbog installeret for."
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "Temaer"
 
+#: ../src/empathy-preferences.ui.h:29
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Brug _ekkoneutralisering til at forbedre opkaldskvaliteten"
+
 #: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variant:"
@@ -4495,18 +4403,22 @@ msgid "_Network (IP, Wi-Fi)"
 msgstr "_Netværk (IP, Wi-Fi)"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Åbn nye chats i særskilte vinduer"
-
-#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Offentliggør placering til mine kontakter"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "_Reducér placeringens nøjagtighed"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "nye _vinduer"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "nye fane_blade"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Status"
@@ -4563,67 +4475,67 @@ msgstr "Video slået til"
 msgid "Video Preview"
 msgstr "Forhåndsvisning for video"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Kontaktkortvisning"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1585
 msgid "Save"
 msgstr "Gem"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1761
 msgid "Debug Window"
 msgstr "Fejlfindingsvindue"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1848
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:1860
 msgid "Level "
 msgstr "Niveau "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1879
 msgid "Debug"
 msgstr "Fejlfind"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1884
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:1889 ../src/empathy-debug-window.c:1935
 msgid "Message"
 msgstr "Besked"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1894
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:1899
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:1904
 msgid "Error"
 msgstr "Fejl"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:1923
 msgid "Time"
 msgstr "Tidspunkt"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1926
 msgid "Domain"
 msgstr "Domæne"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:1928
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:1930
 msgid "Level"
 msgstr "Niveau"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:1953
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4631,89 +4543,89 @@ msgstr ""
 "Den valgte forbindelseshåndtering understøtter ikke udvidelsen til "
 "fjernfejlfinding."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Invitér deltager"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Vælg en kontakt, du vil invitere til samtalen:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Invitér"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Vis ikke nogen dialoger; udfør eventuelt arbejde (såsom import) og afslut"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "Vis ingen dialoger med mindre der kun er \"Folk i nærheden\"-konti"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Vælg den givne konto til at starte med (f.eks. gabble/jabber/"
 "foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy-konti"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-konti"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Vis en bestemt tjeneste"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empathy-fejlfinding"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy-fejlfinding"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy-samtaleklient"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "Svar"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Afvis"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "Besvar"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
 msgid "Answer with video"
 msgstr "Besvar med video"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr "Afslå"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
 msgid "Accept"
 msgstr "Acceptér"
 
@@ -4724,7 +4636,7 @@ msgstr "Acceptér"
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:247
 msgid "Provide"
 msgstr "Giv"
 
@@ -4736,32 +4648,334 @@ msgstr ""
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2727
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "I kø"
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Stilhed"
 
-#: ../src/empathy-call-window.c:2732
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Varighed"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3214
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Din nuværende saldo er %s."
+
+#: ../src/empathy-call-window.c:3218
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Beklager, du har ikke nok på din konto til det opkald."
+
+#: ../src/empathy-call-window.c:3220
+msgid "Top Up"
+msgstr "Fyld op"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Match store/små bogstaver"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Hvilken type chatkonto ønsker du?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Tilføjer ny konto"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Folk i nærheden"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy kan automatisk finde og skrive til brugere, der er sluttet til samme "
+"netværk som dig. Hvis du vil bruge denne funktion, så kontrollér at "
+"detaljerne herunder er korrekte."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Du kan ændre disse detaljer senere eller slå denne funktion fra ved at vælge "
+"<span style=\"italic\">Redigér → Konti</span> i kontaktlisten."
+
+#~ msgid "Call volume"
+#~ msgstr "Opkaldslydstyrke"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Opkaldslydstyrke, som en procentdel."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy har konverteret butterfly-logge"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Om Empathy har konverteret butterfly-logge."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Sokkeltype understøttet ikke"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Mine Webkonti"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Kontoen %s redigeres via %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Kontoen %s kan ikke redigeres i Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Start Mine Webkonti"
+
+#~ msgid "Edit %s"
+#~ msgstr "Redigér %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_Annuller"
+
+#~ msgid "Personal Information"
+#~ msgstr "Personlige oplysninger"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Ikke grupperet"
+
+#~ msgid "Favorite People"
+#~ msgstr "Favoritfolk"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Redigér"
+
+#~ msgid "Select a contact"
+#~ msgstr "Vælg en kontakt"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Sammenkædede kontakter"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Vælg kontakter som skal sammenkædes"
+
+#~ msgid "New contact preview"
+#~ msgstr "Forhåndsvisning af ny kontakt"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "De valgte kontakter i listen til venstre vil blive sammenkædet."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Sammenkæd kontakter…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Sammenkæd kontakter"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Adskil…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Split den valgte sammenkædede kontakt fuldstændigt op i de kontakter den "
+#~ "indeholder."
+
+#~ msgid "_Link"
+#~ msgstr "_Sammenkæd"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Adskil sammenkædet kontakt \"%s\"?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Er du sikker på at du vil adskille disse sammenkædede kontakter? Dette "
+#~ "vil splitte de sammenkædede kontakter fuldstændigt op i de kontakter de "
+#~ "består af."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Adskil"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Kontakt-id:"
+
+#~ msgid "C_hat"
+#~ msgstr "C_hat"
+
+#~ msgid "Send _Video"
+#~ msgstr "Send _video"
+
+#~ msgid "C_all"
+#~ msgstr "_Opkald"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Sæt din tilstedeværelse og status"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Den valgte kontakt kan ikke modtage filer."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Den valgte kontakt er offline."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Der opstod en fejl ved import af kontiene."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Der opstod en fejl ved fortolkning af detaljer for kontoen."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Der opstod en fejl under oprettelse af kontoen."
+
+#~ msgid "There was an error."
+#~ msgstr "Der opstod en fejl."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Fejlmeddelelsen var: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Du kan enten gå tilbage og forsøge at indtaste dine kontodetaljer igen, "
+#~ "eller afslutte denne assistent og tilføje konti senere fra Redigér-menuen."
+
+#~ msgid "An error occurred"
+#~ msgstr "Der opstod en fejl"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Har du andre chatkonti, du vil have indstillet?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Indtast dine kontodetaljer"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Hvilken type konto ønsker du at oprette?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Ønsker du at oprette andre chatkonti?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Indtast detaljerne for den nye konto"
+
+# Jeg tror lige vi ændrer formuleringen lidt frit, eftersom jeg ikke forstår hvad de taler om
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Med Empathy kan du chatte med folk på nettet, f.eks. venner og kolleger "
+#~ "som bruger Google Talk, AIM, Windows Live eller mange andre "
+#~ "chatprogrammer. Med en mikrofon eller et webkamera kan du også foretage "
+#~ "lyd- eller videoopkald."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Har du en konto, som du har brugt med et andet chatprogram?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Ja, importér mine kontodetaljer fra "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Ja, jeg vil indtaste mine kontodetaljer nu"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Nej, jeg vil oprette en ny konto"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr ""
+#~ "Nej, jeg vil bare tale med folk, der er tilsluttet i nærheden, indtil "
+#~ "videre"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Vælg de konti, du vil importere:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Nej, det var alt - indtil videre"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Redigér->Konti"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Jeg vil _ikke aktivere denne funktion indtil videre"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Du vil ikke kunne skrive sammen med brugere, der er tilsluttet dit lokale "
+#~ "netværk, da telepathy-salut ikke er installeret. Hvis du vil aktivere "
+#~ "denne funktion, så installér venligst pakken telepathy-salut og opret en "
+#~ "\"Folk i nærheden\"-konto fra dialogvinduet \"Konti\""
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Assistent for meddelelser og VoIP-konti"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Velkommen til Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importér dine eksisterende konti"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Indtast venligst personlige detaljer"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Du er ved at oprette en ny konto, hvilket vil kassere\n"
+#~ "dine ændringer. Er du sikker på, at du vil fortsætte?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokol:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ukendt"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ukendt"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ukendt"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ukendt"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Personlige oplysninger"
+
+#~ msgid "Input level:"
+#~ msgstr "Inputniveau:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Inputlydstyrke:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Åbn nye chats i særskilte vinduer"
+
 #~ msgid "All"
 #~ msgstr "Alle"
 
@@ -5323,9 +5537,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Edit the groups and name for this contact"
 #~ msgstr "Indtast et navn for konto."
 
-#~ msgid "View previous conversations with this contact"
-#~ msgstr "Vis foregående samtaler"
-
 #~ msgid "<b>Languages</b>"
 #~ msgstr "<b>Sprog</b>"
 
@@ -5401,9 +5612,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "A specific protocol error occurred that was unexpected."
 #~ msgstr "En specifik protokolfejl opstod uventet."
 
-#~ msgid "Home"
-#~ msgstr "Hjemme"
-
 #~ msgid "This service is unavailable or not found"
 #~ msgstr "Denne funktion er ikke tilgængelig."
 
@@ -5478,9 +5686,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Someone would like to send you a file."
 #~ msgstr "Nogen vil gerne sende dig en fil."
 
-#~ msgid "Retry connection"
-#~ msgstr "Stop tilslutning"
-
 #~ msgid "Invited %s to join this chat conference."
 #~ msgstr "Inviterede %s til at deltage i denne konferencesamtale."
 
@@ -5568,9 +5773,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "<b>About</b>"
 #~ msgstr "<b>Om</b>"
 
-#~ msgid "<b>Personal Details</b>"
-#~ msgstr "<b>Personlige detaljer</b>"
-
 #~ msgid "<b>Status</b>"
 #~ msgstr "<b>Status</b>"
 
@@ -5623,9 +5825,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Use system pro_xy"
 #~ msgstr "Benyt systemets _mellemvært"
 
-#~ msgid "_Connect"
-#~ msgstr "_Tilslut"
-
 #~ msgid "_Disconnect"
 #~ msgstr "_Frakobl"
 
@@ -5653,9 +5852,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "_Web site:"
 #~ msgstr "Hjemmeside:"
 
-#~ msgid "irc account settings"
-#~ msgstr "<b>Kontoindstillinger</b>"
-
 #~ msgid "msn account settings"
 #~ msgstr "<b>Kontoindstillinger</b>"
 
@@ -5768,9 +5964,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Chat Rooms..."
 #~ msgstr "Samtalerum"
 
-#~ msgid "Connection Details"
-#~ msgstr "Forbindelsesdetaljer"
-
 #~ msgid "Enter the server used in the connection for this account"
 #~ msgstr ""
 #~ "Indtast den server der bliver brugt ved tilslutning for denne konto."
@@ -5908,9 +6101,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Gossip, Instant Messaging Client"
 #~ msgstr "Gossip, samtaleklient"
 
-#~ msgid "Close this chat window"
-#~ msgstr "Luk dette samtalerum"
-
 #~ msgid "Requested Information"
 #~ msgstr "Anmodede oplysninger"
 
@@ -6151,9 +6341,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "<b>Preset status messages</b>"
 #~ msgstr "<b>Forvalgte statusbeskeder</b>"
 
-#~ msgid "Add Another Account"
-#~ msgstr "Tilføj en anden konto"
-
 #~ msgid "Configuring Service"
 #~ msgstr "Registeringstjeneste"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index cea232b12..2d3d810d5 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -1,2380 +1,4720 @@
-# Canadian English translation of gossip.
-# Copyright (C) 2004-2005 Adam Weinberger and the GNOME Foundation
-# This file is distributed under the same licence as the gossip package.
+# Canadian English translations for Empathy package.
+# Copyright (C) 2012 EMPATHY'S COPYRIGHT HOLDER
+# This file is distributed under the same licence as the Empathy package.
 # Adam Weinberger <adamw@gnome.org>, 2004, 2005.
-# 
-# 
+# Tiffany Antopolski <tiffany.antopolski@gmail.com>, 2012.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gossip\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-15 23:46+0200\n"
-"PO-Revision-Date: 2005-08-27 20:31-0500\n"
-"Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
-"Language-Team: Canadian English <adamw@gnome.org>\n"
+"Project-Id-Version: Empathy\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-02-08 15:44+0000\n"
+"PO-Revision-Date: 2012-02-08 19:16-0500\n"
+"Last-Translator: Tiffany Antopolski <tiffany.antopolski@gmail.com>\n"
+"Language-Team: Canadian English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_CA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/empathy.desktop.in.h:1
-#, fuzzy
-msgid "Empathy Instant Messenger"
-msgstr "Instant Messenger"
+#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Empathy"
 
-#: ../data/empathy.desktop.in.h:2
-msgid "Instant Messenger"
-msgstr "Instant Messenger"
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "IM Client"
 
-#: ../data/empathy.schemas.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Always open a separate chat window for new chats."
+#: ../data/empathy.desktop.in.in.h:3
+msgid "Empathy Internet Messaging"
+msgstr "Empathy Internet Messaging"
 
-#: ../data/empathy.schemas.in.h:2
-msgid "Chat window theme"
-msgstr "Chat window theme"
+#: ../data/empathy.desktop.in.in.h:4
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
+msgid "Connection managers should be used"
+msgstr "Connection managers should be used"
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
-"Comma-separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 
-#: ../data/empathy.schemas.in.h:4
-#, fuzzy
-msgid "Compact contact list"
-msgstr "_Show Contact List"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy should auto-connect on startup"
 
-#: ../data/empathy.schemas.in.h:5
-msgid "Contact list sort criterium"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
+"Whether Empathy should automatically log into your accounts on startup."
 
-#: ../data/empathy.schemas.in.h:6
-msgid "Default directory to select an avatar image from"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy should auto-away when idle"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
+"Whether Empathy should go into away mode automatically if the user is idle."
 
-#: ../data/empathy.schemas.in.h:7
-msgid "Enable popup when contact is available"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Empathy default download folder"
+msgstr "Empathy default download folder"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "The default folder to save file transfers in."
+msgstr "The default folder to save file transfers in."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid "Show offline contacts"
+msgstr "Show offline contacts"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Whether to show contacts that are offline in the contact list."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Show avatars"
+msgstr "Show avatars"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
+"Whether to show avatars for contacts in the contact list and chat windows."
 
-#: ../data/empathy.schemas.in.h:8
-#, fuzzy
-msgid "Enable sound when away"
-msgstr "Disable sounds when _away"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Show protocols"
+msgstr "Show protocols"
 
-#: ../data/empathy.schemas.in.h:9
-#, fuzzy
-msgid "Enable sound when busy"
-msgstr "Disable sounds when _busy"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Whether to show protocols for contacts in the contact list."
 
-#: ../data/empathy.schemas.in.h:10
-#, fuzzy
-msgid "Enable spell checker"
-msgstr "Enable spell checking"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+msgid "Show Balance in contact list"
+msgstr "Show Balance in contact list"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+msgid "Whether to show account balances in the contact list."
+msgstr "Whether to show account balances in the contact list."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+msgid "Compact contact list"
+msgstr "Compact contact list"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Whether to show the contact list in compact mode."
+msgstr "Whether to show the contact list in compact mode."
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Hide main window"
 msgstr "Hide main window"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Hide the main window."
 msgstr "Hide the main window."
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+msgid "Default directory to select an avatar image from"
+msgstr "Default directory to select an avatar image from"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+msgid "The last directory that an avatar image was chosen from."
+msgstr "The last directory that an avatar image was chosen from."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Open new chats in separate windows"
 msgstr "Open new chats in separate windows"
 
-#: ../data/empathy.schemas.in.h:14
-#, fuzzy
-msgid "Show avatars"
-msgstr "_Show Contacts"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+msgid "Always open a separate chat window for new chats."
+msgstr "Always open a separate chat window for new chats."
 
-#: ../data/empathy.schemas.in.h:15
-#, fuzzy
-msgid "Show hint about closing the main window"
-msgstr "The height of the main window."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+msgid "Display incoming events in the status area"
+msgstr "Display incoming events in the status area"
 
-#: ../data/empathy.schemas.in.h:16
-msgid "Show offline contacts"
-msgstr "Show offline contacts"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
 
-#: ../data/empathy.schemas.in.h:17
-msgid "Spell checking languages"
-msgstr "Spell checking languages"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+msgid "The position for the chat window side pane"
+msgstr "The position for the chat window side pane"
 
-#: ../data/empathy.schemas.in.h:18
-msgid "The last directory that an avatar image was chosen from."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "The stored position (in pixels) of the chat window side pane."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+msgid "Contact list sort criterion"
+msgstr "Contact list sort criterion"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 
-#: ../data/empathy.schemas.in.h:19
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "The theme that is used to display the conversation in chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Use notification sounds"
+msgstr "Use notification sounds"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+msgid "Whether to play a sound to notify of events."
+msgstr "Whether to play a sound to notify of events."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Disable sounds when away"
+msgstr "Disable sounds when away"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Whether to play sound notifications when away or busy."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Play a sound for incoming messages"
+msgstr "Play a sound for incoming messages"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Whether to play a sound to notify of incoming messages."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+msgid "Play a sound for outgoing messages"
+msgstr "Play a sound for outgoing messages"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Whether to play a sound to notify of outgoing messages."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+msgid "Play a sound for new conversations"
+msgstr "Play a sound for new conversations"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Whether to play a sound to notify of new conversations."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+msgid "Play a sound when a contact logs in"
+msgstr "Play a sound when a contact logs in"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging into the network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+msgid "Play a sound when a contact logs out"
+msgstr "Play a sound when a contact logs out"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging out of the network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+msgid "Play a sound when we log in"
+msgstr "Play a sound when we log in"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+msgid "Whether to play a sound when logging into a network."
+msgstr "Whether to play a sound when logging into a network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+msgid "Play a sound when we log out"
+msgstr "Play a sound when we log out"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Whether to play a sound when logging out of a network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Enable popup notifications for new messages"
+msgstr "Enable popup notifications for new messages"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Whether to show a popup notification when receiving a new message."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "Disable popup notifications when away"
+msgstr "Disable popup notifications when away"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Whether to show popup notifications when away or busy."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Pop up notifications if the chat isn't focused"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+msgid "Pop up notifications when a contact logs in"
+msgstr "Pop up notifications when a contact logs in"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Whether to show a popup notification when a contact goes online."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+msgid "Pop up notifications when a contact logs out"
+msgstr "Pop up notifications when a contact logs out"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Whether to show a popup notification when a contact goes offline."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Use graphical smileys"
 msgstr "Use graphical smileys"
 
-#: ../data/empathy.schemas.in.h:21
-msgid "Use notification sounds"
-msgstr "Use notification sounds"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Whether to convert smileys into graphical images in conversations."
 
-#: ../data/empathy.schemas.in.h:22
-#, fuzzy
-msgid "Use theme for chat rooms"
-msgstr "_Invite to Chat Room"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+msgid "Show contact list in rooms"
+msgstr "Show contact list in rooms"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Whether to show the contact list in chat rooms."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+msgid "Chat window theme"
+msgstr "Chat window theme"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "The theme that is used to display the conversation in chat windows."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+msgid "Chat window theme variant"
+msgstr "Chat window theme variant"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"The theme variant that is used to display the conversation in chat windows."
 msgstr ""
+"The theme variant that is used to display the conversation in chat windows."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+msgid "Path of the Adium theme to use"
+msgstr "Path of the Adium theme to use"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+msgid "Enable WebKit Developer Tools"
+msgstr "Enable WebKit Developer Tools"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Whether or not to convert smileys into graphical images in conversations."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 
-#: ../data/empathy.schemas.in.h:25
-msgid "Whether or not to play a sound when messages arrive."
-msgstr "Whether or not to play a sound when messages arrive."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+msgid "Use theme for chat rooms"
+msgstr "Use theme for chat rooms"
 
-#: ../data/empathy.schemas.in.h:26
-msgid "Whether or not to play sounds when away."
-msgstr "Whether or not to play sounds when away."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+msgid "Whether to use the theme for chat rooms."
+msgstr "Whether to use the theme for chat rooms."
 
-#: ../data/empathy.schemas.in.h:27
-msgid "Whether or not to play sounds when busy."
-msgstr "Whether or not to play sounds when busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Spell checking languages"
+msgstr "Spell checking languages"
 
-#: ../data/empathy.schemas.in.h:28
-#, fuzzy
-msgid "Whether or not to show a popup when a contact becomes available."
-msgstr "Whether or not to play a sound when messages arrive."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 
-#: ../data/empathy.schemas.in.h:29
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Enable spell checker"
+msgstr "Enable spell checker"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
-msgstr "Whether or not to show contacts that are offline in the contact list."
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Whether to check words typed against the languages you want to check with."
 
-#: ../data/empathy.schemas.in.h:30
-msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr "Whether or not to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Nick completed character"
+msgstr "Nick completed character"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 
-#: ../data/empathy.schemas.in.h:32
-#, fuzzy
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "Whether or not to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy should use the avatar of the contact as the chat window icon"
 
-#: ../data/empathy.schemas.in.h:33
-msgid "Whether to use the theme for chat rooms or not."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid "Last account selected in Join Room dialog"
+msgstr "Last account selected in Join Room dialog"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "D-Bus object path of the last account selected to join a room."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Camera device"
+msgstr "Camera device"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Default camera device to use in video calls, e.g. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Camera position"
+msgstr "Camera position"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+msgid "Position the camera preview should be during a call."
+msgstr "Position the camera preview should be during a call."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Echo cancellation support"
+msgstr "Echo cancellllation support"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Whether to enable Pulseaudio's echo cancellllation filter."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Show hint about closing the main window"
+msgstr "Show hint about closing the main window"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 
-#: ../libempathy/gossip-contact.c:654 ../libempathy/gossip-presence.c:184
-#: ../libempathy/gossip-presence.c:283
-msgid "Offline"
-msgstr "Offline"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+msgid "Empathy can publish the user's location"
+msgstr "Empathy can publish the user's location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Whether Empathy can publish the user's location to their contacts."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy can use the network to guess the location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Whether Empathy can use the network to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy can use the cellular network to guess the location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Whether Empathy can use the cellular network to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy can use the GPS to guess the location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Whether Empathy can use the GPS to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy should reduce the location's accuracy"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2327
+msgid "Messaging and VoIP Accounts"
+msgstr "Messaging and VoIP Accounts"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Manage Messaging and VoIP accounts"
+
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "No reason was specified"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "The change in state was requested"
 
-#: ../libempathy/gossip-presence.c:274
-#, fuzzy
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "You cancellled the file transfer"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "The other participant cancellled the file transfer"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Error while trying to transfer the file"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "The other participant is unable to transfer the file"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Unknown reason"
+
+#: ../libempathy/empathy-ft-handler.c:917
+msgid "File transfer completed, but the file was corrupted"
+msgstr "File transfer completed, but the file was corrupted"
+
+#: ../libempathy/empathy-ft-handler.c:1203
+msgid "File transfer not supported by remote contact"
+msgstr "File transfer not supported by remote contact"
+
+#: ../libempathy/empathy-ft-handler.c:1259
+msgid "The selected file is not a regular file"
+msgstr "The selected file is not a regular file"
+
+#: ../libempathy/empathy-ft-handler.c:1268
+msgid "The selected file is empty"
+msgstr "The selected file is empty"
+
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Missed call from %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Called %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Call from %s"
+
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
-msgstr "Available..."
+msgstr "Available"
 
-#: ../libempathy/gossip-presence.c:276
-#, fuzzy
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
-msgstr "Busy..."
+msgstr "Busy"
 
-#: ../libempathy/gossip-presence.c:279
-#, fuzzy
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
-msgstr "Away..."
-
-#: ../libempathy-gtk/empathy-main-window.c:254
-#, fuzzy
-msgid "Show and edit accounts"
-msgstr "_Show Contacts"
+msgstr "Away"
 
-#: ../libempathy-gtk/empathy-main-window.c:456
-msgid "Group"
-msgstr "Group"
+#: ../libempathy/empathy-utils.c:240
+msgid "Invisible"
+msgstr "Invisible"
 
-#: ../libempathy-gtk/empathy-main-window.c:477
-#, fuzzy
-msgid "Contact"
-msgstr "_Add Contact..."
+#: ../libempathy/empathy-utils.c:242
+msgid "Offline"
+msgstr "Offline"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:1
-#, fuzzy
-msgid "Contact List - Empathy"
-msgstr "_Hide Contact List"
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:245
+msgctxt "presence"
+msgid "Unknown"
+msgstr "Unknown"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:2
-#, fuzzy
-msgid "Context"
-msgstr "_Contents"
+#: ../libempathy/empathy-utils.c:285
+msgid "No reason specified"
+msgstr "No reason specified"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:3
-#, fuzzy
-msgid "Join _Favorites"
-msgstr "_Add to Favourites"
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+msgid "Status is set to offline"
+msgstr "Status is set to offline"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:4
-#: ../libempathy-gtk/gossip-chat.glade.h:10
-msgid "Join _New..."
-msgstr ""
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+msgid "Network error"
+msgstr "Network error"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:5
-#, fuzzy
-msgid "Manage Favorites..."
-msgstr "_Add to Favourites"
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+msgid "Authentication failed"
+msgstr "Authentication failed"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Show _Offline Contacts"
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+msgid "Encryption error"
+msgstr "Encryption error"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:7
-#, fuzzy
-msgid "_About"
-msgstr "_Accounts"
+#: ../libempathy/empathy-utils.c:295
+msgid "Name in use"
+msgstr "Name in use"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:8
-msgid "_Accounts"
-msgstr "_Accounts"
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+msgid "Certificate not provided"
+msgstr "Certificate not provided"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:9
-#: ../libempathy-gtk/gossip-chat.glade.h:15
-msgid "_Add Contact..."
-msgstr "_Add Contact..."
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+msgid "Certificate untrusted"
+msgstr "Certificate untrusted"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:10
-#: ../libempathy-gtk/gossip-contact-list.c:298
-msgid "_Chat"
-msgstr "_Chat"
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+msgid "Certificate expired"
+msgstr "Certificate expired"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:11
-msgid "_Contents"
-msgstr "_Contents"
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+msgid "Certificate not activated"
+msgstr "Certificate not activated"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:12
-#: ../libempathy-gtk/gossip-chat.glade.h:21
-#: ../libempathy-gtk/gossip-contact-list.c:310
-#, fuzzy
-msgid "_Edit"
-msgstr "Edit"
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+msgid "Certificate hostname mismatch"
+msgstr "Certificate hostname mismatch"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:13
-msgid "_Help"
-msgstr ""
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+msgid "Certificate fingerprint mismatch"
+msgstr "Certificate fingerprint mismatch"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:14
-#: ../libempathy-gtk/empathy-status-icon.glade.h:2
-msgid "_New Message..."
-msgstr "_New Message..."
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+msgid "Certificate self-signed"
+msgstr "Certificate self-signed"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:15
-msgid "_Personal Information"
-msgstr "_Personal Information"
+#: ../libempathy/empathy-utils.c:311
+msgid "Certificate error"
+msgstr "Certificate error"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:16
-msgid "_Preferences"
-msgstr "_Preferences"
+#: ../libempathy/empathy-utils.c:345
+msgid "Encryption is not available"
+msgstr "Encryption is not available"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:17
-#: ../libempathy-gtk/empathy-status-icon.glade.h:3
-msgid "_Quit"
-msgstr ""
+#: ../libempathy/empathy-utils.c:347
+msgid "Certificate is invalid"
+msgstr "Certificate is invalid"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:18
-#: ../libempathy-gtk/gossip-chat.glade.h:25
-#, fuzzy
-msgid "_Room"
-msgstr "_Room:"
+#: ../libempathy/empathy-utils.c:349
+msgid "Connection has been refused"
+msgstr "Connection has been refused"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:19
-#: ../libempathy-gtk/gossip-chat.glade.h:28
-#: ../libempathy-gtk/gossip-contact-list.c:326
-#, fuzzy
-msgid "_View Previous Conversations"
-msgstr "_Conversation"
+#: ../libempathy/empathy-utils.c:351
+msgid "Connection can't be established"
+msgstr "Connection can't be established"
 
-#: ../libempathy-gtk/empathy-status-icon.glade.h:1
-msgid "Status"
-msgstr "Status"
+#: ../libempathy/empathy-utils.c:353
+msgid "Connection has been lost"
+msgstr "Connection has been lost"
 
-#: ../libempathy-gtk/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "_Show Contact List"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "This account is already connected to the server"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:63
+#: ../libempathy/empathy-utils.c:357
 msgid ""
-"Empathy is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
+"Connection has been replaced by a new connection using the same resource"
 msgstr ""
+"Connection has been replaced by a new connection using the same resource"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "The account already exists on the server"
+msgstr "The account already exists on the server"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Server is currently too busy to handle the connection"
+msgstr "Server is currently too busy to handle the connection"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:67
+#: ../libempathy/empathy-utils.c:364
+msgid "Certificate has been revoked"
+msgstr "Certificate has been revoked"
+
+#: ../libempathy/empathy-utils.c:366
 msgid ""
-"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:71
+#: ../libempathy/empathy-utils.c:369
 msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
 msgstr ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:99
-#, fuzzy
-msgid "An Instant Messaging client for GNOME"
-msgstr "Gossip, Instant Messaging Client"
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Your software is too old"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:105
-#, fuzzy
-msgid "translator-credits"
-msgstr "Adam Weinberger"
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Internal error"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:224
-#, fuzzy
-msgid "Disable"
-msgstr "Available..."
+#: ../libempathy/empathy-utils.c:534
+msgid "People Nearby"
+msgstr "People Nearby"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:227
-msgid "Enable"
-msgstr ""
+#: ../libempathy/empathy-utils.c:539
+msgid "Yahoo! Japan"
+msgstr "Yahoo! Japan"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:261
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:3
-#, fuzzy
-msgid "<b>No Account Selected</b>"
-msgstr "<b>About</b>"
+#: ../libempathy/empathy-utils.c:568
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:263
-msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to start configuring.\n"
-"\n"
-"If you do not want to add an account, simply click on the account you want "
-"to configure in the list on the left."
-msgstr ""
+#: ../libempathy/empathy-utils.c:569
+msgid "Facebook Chat"
+msgstr "Facebook Chat"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:272
-#, fuzzy
-msgid "<b>No Accounts Configured</b>"
-msgstr "<b>About</b>"
+#: ../libempathy/empathy-time.c:90
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d second ago"
+msgstr[1] "%d seconds ago"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:274
-msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to start configuring."
-msgstr ""
+#: ../libempathy/empathy-time.c:96
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d minute ago"
+msgstr[1] "%d minutes ago"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:362
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:6
-msgid "Accounts"
-msgstr "Accounts"
+#: ../libempathy/empathy-time.c:102
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d hour ago"
+msgstr[1] "%d hours ago"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:857
+#: ../libempathy/empathy-time.c:108
 #, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d day ago"
+msgstr[1] "%d days ago"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:863
+#: ../libempathy/empathy-time.c:114
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d week ago"
+msgstr[1] "%d weeks ago"
+
+#: ../libempathy/empathy-time.c:120
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d month ago"
+msgstr[1] "%d months ago"
+
+#: ../libempathy/empathy-time.c:142
+msgid "in the future"
+msgstr "in the future"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
+msgid "All accounts"
+msgstr "All accounts"
+
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
+msgid "Account"
+msgstr "Account"
+
+#: ../libempathy-gtk/empathy-account-widget.c:683
+msgid "Password"
+msgstr "Password"
+
+#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Server"
+
+#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Port"
+
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Username:"
+msgstr "Username:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1710
+msgid "A_pply"
+msgstr "A_pply"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1739
+msgid "L_og in"
+msgstr "L_og in"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1812
+msgid "This account already exists on the server"
+msgstr "This account already exists on the server"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1816
+msgid "Create a new account on the server"
+msgstr "Create a new account on the server"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:2241
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%1$s on %2$s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../libempathy-gtk/empathy-account-widget.c:2267
+#, c-format
+msgid "%s Account"
+msgstr "%s Account"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2271
+msgid "New account"
+msgstr "New account"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Pass_word:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+msgid "Screen _Name:"
+msgstr "Screen _Name:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Example:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Remember password"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Advanced"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+msgid "What is your AIM screen name?"
+msgstr "What is your AIM screen name?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+msgid "What is your AIM password?"
+msgstr "What is your AIM password?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Remember Password"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+msgid "Login I_D:"
+msgstr "Login I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Example:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+msgid "What is your GroupWise User ID?"
+msgstr "What is your GroupWise User ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+msgid "What is your GroupWise password?"
+msgstr "What is your GroupWise password?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Example:</b> 123456789"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "Ch_aracter set:"
+msgstr "Ch_aracter set:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+msgid "What is your ICQ UIN?"
+msgstr "What is your ICQ UIN?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+msgid "What is your ICQ password?"
+msgstr "What is your ICQ password?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
+msgid "Auto"
+msgstr "Auto"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
+msgid "TLS"
+msgstr "TLS"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
+msgid "Register"
+msgstr "Register"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
+msgid "Options"
+msgstr "Options"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
+msgid "None"
+msgstr "None"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Network"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Network:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Character set:"
+msgstr "Character set:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servers"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
 msgstr ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Account</b>"
-msgstr "<b>About</b>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+msgid "Nickname:"
+msgstr "Nickname:"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:2
-#, fuzzy
-msgid "<b>New Account</b>"
-msgstr "<b>About</b>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+msgid "Password:"
+msgstr "Password:"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:4
-#, fuzzy
-msgid "<b>Settings</b>"
-msgstr "<b>Status</b>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Quit message:"
+msgstr "Quit message:"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:5
-msgid "A unique name for this account to identify it personally to you."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "Real name:"
+msgstr "Real name:"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:7
-#, fuzzy
-msgid "Cr_eate"
-msgstr "Chat"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Which IRC network?"
+msgstr "Which IRC network?"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:8
-msgid "Imendio "
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "What is your IRC nickname?"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:9
-msgid "Jabber"
-msgstr "Jabber"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "What is your Facebook username?"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:10
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to started configuring.\n"
-"\n"
-"If you do not want to add an account, simply click on the account you want "
-"to configure in the list on the left."
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
 msgstr ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:13
-msgid "_Name:"
-msgstr "_Name:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "What is your Facebook password?"
+msgstr "What is your Facebook password?"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:14
-#, fuzzy
-msgid "_Type:"
-msgstr "_Topic:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "What is your Google ID?"
+msgstr "What is your Google ID?"
 
-#: ../libempathy-gtk/gossip-account-widget-generic.c:144
-#: ../libempathy-gtk/gossip-account-widget-generic.c:186
-#, c-format
-msgid "%s:"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Example:</b> user@gmail.com"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:1
-#, fuzzy
-msgid ""
-"<small><b><span foreground=\"#555\">Example: user@jabber.org</span></b></"
-"small>"
-msgstr "<span size=\"smaller\">Example: user@jabber.org</span>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google password?"
+msgstr "What is your Google password?"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Example:</b> user@jabber.org"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:3
-msgid "Login I_D:"
-msgstr "Login I_D:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnore SSL certificate errors"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:4
-#, fuzzy
-msgid "Pass_word:"
-msgstr "_Password:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Priori_ty:"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:5
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Reso_urce:"
-msgstr "R_esource:"
+msgstr "Reso_urce:"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:6
-#, fuzzy
-msgid "Use encryption (SS_L)"
-msgstr "Use _encryption (SSL)"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Encr_yption required (TLS/SSL)"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:7
-#, fuzzy
-msgid "_Port:"
-msgstr "Por_t:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Use old SS_L"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:8
-msgid "_Server:"
-msgstr "_Server:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Override server settings"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:9
-msgid "jabber account settings"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+msgid "What is your Jabber ID?"
+msgstr "What is your Jabber ID?"
 
-#: ../libempathy-gtk/gossip-chat.c:314
-msgid "Disconnected"
-msgstr "Disconnected"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+msgid "What is your desired Jabber ID?"
+msgstr "What is your desired Jabber ID?"
 
-#: ../libempathy-gtk/gossip-chat.c:858
-msgid "Insert Smiley"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "What is your Jabber password?"
 
-#: ../libempathy-gtk/gossip-chat.c:906
-msgid "_Check Word Spelling..."
-msgstr "_Check Word Spelling..."
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+msgid "What is your desired Jabber password?"
+msgstr "What is your desired Jabber password?"
 
-#: ../libempathy-gtk/gossip-chat.c:1244
-msgid "Connected"
-msgstr "Connected"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>Example:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:1
-msgid "C_lear"
-msgstr "C_lear"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+msgid "What is your Windows Live ID?"
+msgstr "What is your Windows Live ID?"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:2
-msgid "Change _Topic..."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+msgid "What is your Windows Live password?"
+msgstr "What is your Windows Live password?"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:3
-msgid "Chat"
-msgstr "Chat"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+msgid "Nic_kname:"
+msgstr "Nic_kname:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:4
-#, fuzzy
-msgid "Contact Infor_mation"
-msgstr "Contact _Information"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Last Name:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:5
-#, fuzzy
-msgid "Cu_t"
-msgstr "Ch_at"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "_First Name:"
+msgstr "_First Name:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:6
-msgid "In_vite..."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Published Name:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:7
-msgid "Insert _Smiley"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:8
-#, fuzzy
-msgid "Invitation _message:"
-msgstr "Enter status message:"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
+msgid "E-_mail address:"
+msgstr "E-_mail address:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:9
-msgid "Invite"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Username:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:11
-msgid "Move Tab _Left"
-msgstr "Move Tab _Left"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>Example:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:12
-msgid "Move Tab _Right"
-msgstr "Move Tab _Right"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Use this account to call _landlines and mobile phones"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:13
-msgid "Select who would you like to invite:"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "NAT Traversal Options"
+msgstr "NAT Traversal Options"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:14
-msgid "You have been invited to join a chat conference."
-msgstr "You have been invited to join a chat conference."
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Proxy Options"
+msgstr "Proxy Options"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:16
-#, fuzzy
-msgid "_Add To Favorites"
-msgstr "_Add to Favourites"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Miscellaneous Options"
+msgstr "Miscellaneous Options"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:17
-msgid "_Close"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "STUN Server:"
+msgstr "STUN Server:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:18
-msgid "_Conversation"
-msgstr "_Conversation"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Discover the STUN server automatically"
+msgstr "Discover the STUN server automatically"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:19
-msgid "_Copy"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Discover Binding"
+msgstr "Discover Binding"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:20
-msgid "_Detach Tab"
-msgstr "_Detach Tab"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive Options"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Mechanism:"
+msgstr "Mechanism:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Interval (seconds)"
+msgstr "Interval (seconds)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Authentication username:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "Loose Routing"
+msgstr "Loose Routing"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Ignore TLS Errors"
+msgstr "Ignore TLS Errors"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid "Port:"
+msgstr "Port:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "What is your SIP login ID?"
+msgstr "What is your SIP login ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "What is your SIP account password?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "I_gnore conference and chat room invitations"
+msgstr "I_gnore conference and chat room invitations"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Room List locale:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "What is your Yahoo! ID?"
+msgstr "What is your Yahoo! ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+msgid "What is your Yahoo! password?"
+msgstr "What is your Yahoo! password?"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
+msgid "Couldn't convert image"
+msgstr "Couldn't convert image"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:22
-msgid "_Next Tab"
-msgstr "_Next Tab"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+msgid "None of the accepted image formats are supported on your system"
+msgstr "None of the accepted image formats are supported on your system"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:23
-msgid "_Paste"
-msgstr ""
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Couldn't save picture to file"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:24
-msgid "_Previous Tab"
-msgstr "_Previous Tab"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+msgid "Select Your Avatar Image"
+msgstr "Select Your Avatar Image"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:26
-msgid "_Show Contacts"
-msgstr "_Show Contacts"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "Take a picture..."
 
-#: ../libempathy-gtk/gossip-chat.glade.h:27
-msgid "_Tabs"
-msgstr "_Tabs"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+msgid "No Image"
+msgstr "No Image"
 
-#: ../libempathy-gtk/gossip-chat-view.c:544
-msgid "_Copy Link Address"
-msgstr "_Copy Link Address"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+msgid "Images"
+msgstr "Images"
 
-#: ../libempathy-gtk/gossip-chat-view.c:552
-msgid "_Open Link"
-msgstr "_Open Link"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+msgid "All Files"
+msgstr "All Files"
 
-#: ../libempathy-gtk/gossip-chat-view.c:889
-msgid "%A %d %B %Y"
-msgstr "%A %d %B %Y"
+#: ../libempathy-gtk/empathy-avatar-image.c:322
+msgid "Click to enlarge"
+msgstr "Click to enlarge"
 
-#: ../libempathy-gtk/gossip-chat-window.c:685
-#: ../libempathy-gtk/gossip-chat-window.c:715
-#, fuzzy
-msgid "New Message"
-msgid_plural "New Messages"
-msgstr[0] "_New Message..."
-msgstr[1] "_New Message..."
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:62
+msgid "There was an error starting the call"
+msgstr "There was an error starting the call"
 
-#: ../libempathy-gtk/gossip-chat-window.c:691
-#, fuzzy
-msgid "Chat Room"
-msgstr "Chat Room:"
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "The specified contact doesn't support calls"
 
-#: ../libempathy-gtk/gossip-chat-window.c:696
-#: ../libempathy-gtk/gossip-chat-window.c:719
-#, fuzzy, c-format
-msgid "Conversation"
-msgid_plural "Conversations (%d)"
-msgstr[0] "_Conversation"
-msgstr[1] "_Conversation"
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "The specified contact is offline"
 
-#: ../libempathy-gtk/gossip-chat-window.c:1295
-msgid "Typing a message."
-msgstr "Typing a message."
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "The specified contact is not valid"
 
-#: ../libempathy-gtk/gossip-contact-list.c:290
-#, fuzzy
-msgid "_Contact"
-msgstr "_Add Contact..."
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Emergency calls are not supported on this protocol"
 
-#: ../libempathy-gtk/gossip-contact-list.c:294
-#, fuzzy
-msgid "_Group"
-msgstr "Group"
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "You don't have enough credit in order to place this call"
 
-#: ../libempathy-gtk/gossip-contact-list.c:298
-#, fuzzy
-msgid "Chat with contact"
-msgstr "Add a contact"
+#: ../libempathy-gtk/empathy-chat.c:710
+msgid "Failed to open private chat"
+msgstr "Failed to open private chat"
 
-#: ../libempathy-gtk/gossip-contact-list.c:302
-#, fuzzy
-msgid "Infor_mation"
-msgstr "Contact _Information"
-
-#: ../libempathy-gtk/gossip-contact-list.c:302
-#, fuzzy
-msgid "View contact information"
-msgstr "Contact information"
-
-#: ../libempathy-gtk/gossip-contact-list.c:306
-#, fuzzy
-msgid "Re_name"
-msgstr "/Re_name group"
-
-#: ../libempathy-gtk/gossip-contact-list.c:306
-#, fuzzy
-msgid "Rename"
-msgstr "File name:"
-
-#: ../libempathy-gtk/gossip-contact-list.c:310
-#, fuzzy
-msgid "Edit the groups and name for this contact"
-msgstr ""
-"Please enter a new nickname for the contact\n"
-"%s"
+#: ../libempathy-gtk/empathy-chat.c:768
+msgid "Topic not supported on this conversation"
+msgstr "Topic not supported on this conversation"
 
-#: ../libempathy-gtk/gossip-contact-list.c:314
-#, fuzzy
-msgid "_Remove"
-msgstr "/_Remove Contact"
+#: ../libempathy-gtk/empathy-chat.c:774
+msgid "You are not allowed to change the topic"
+msgstr "You are not allowed to change the topic"
 
-#: ../libempathy-gtk/gossip-contact-list.c:314
-#, fuzzy
-msgid "Remove contact"
-msgstr "/_Remove Contact"
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "“%s� is not a valid contact ID"
 
-#: ../libempathy-gtk/gossip-contact-list.c:318
-#, fuzzy
-msgid "_Invite to Chat Room"
-msgstr "_Invite to Chat Room"
+#: ../libempathy-gtk/empathy-chat.c:1068
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: clear all messages from the current conversation"
+
+#: ../libempathy-gtk/empathy-chat.c:1071
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <topic>: set the topic of the current conversation"
+
+#: ../libempathy-gtk/empathy-chat.c:1074
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <chat room ID>: join a new chat room"
+
+#: ../libempathy-gtk/empathy-chat.c:1077
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <chat room ID>: join a new chat room"
 
-#: ../libempathy-gtk/gossip-contact-list.c:318
-msgid "Invite to a currently open chat room"
+#: ../libempathy-gtk/empathy-chat.c:1081
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
 msgstr ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
 
-#: ../libempathy-gtk/gossip-contact-list.c:322
-#, fuzzy
-msgid "_Send File..."
-msgstr "/_Send File..."
+#: ../libempathy-gtk/empathy-chat.c:1085
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <contact ID> [<message>]: open a private chat"
 
-#: ../libempathy-gtk/gossip-contact-list.c:322
-#, fuzzy
-msgid "Send a file"
-msgstr "Select a file"
+#: ../libempathy-gtk/empathy-chat.c:1088
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <contact ID> <message>: open a private chat"
 
-#: ../libempathy-gtk/gossip-contact-list.c:326
-#, fuzzy
-msgid "View previous conversations with this contact"
-msgstr "_Conversation"
+#: ../libempathy-gtk/empathy-chat.c:1091
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <nickname>: change your nickname on the current server"
 
-#: ../libempathy-gtk/gossip-preferences.c:250
-msgid "Language"
-msgstr "Language"
+#: ../libempathy-gtk/empathy-chat.c:1094
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <message>: send an ACTION message to the current conversation"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:1
-#, fuzzy
-msgid "<b>Appearance</b>"
-msgstr "<b>Appearance and Behaviour</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:2
-#, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>About</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:3
-#, fuzzy
-msgid "<b>Behaviour</b>"
-msgstr "<b>Appearance and Behaviour</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:4
-#, fuzzy
-msgid "<b>Contact List</b>"
-msgstr "<b>Status</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:5
-msgid "<b>Languages</b>"
-msgstr "<b>Languages</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:6
-#, fuzzy
-msgid "<b>Options</b>"
-msgstr "Connection"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:7
-#, fuzzy
-msgid "<b>Visual</b>"
-msgstr "<b>Options</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:8
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
 msgstr ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
+
+#: ../libempathy-gtk/empathy-chat.c:1102
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <contact ID>: display information about a contact"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:9
-msgid "Avatars are user chosen images shown in the contact list"
+#: ../libempathy-gtk/empathy-chat.c:1105
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
 msgstr ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:10
-#, fuzzy
-msgid "Chat Th_eme:"
-msgstr "Chat window theme"
+#: ../libempathy-gtk/empathy-chat.c:1124
+#, c-format
+msgid "Usage: %s"
+msgstr "Usage: %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:11
-msgid "Display notifications when contacts come _online"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1169
+msgid "Unknown command"
+msgstr "Unknown command"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:12
-#, fuzzy
-msgid "Enable sounds when _away"
-msgstr "Disable sounds when _away"
+#: ../libempathy-gtk/empathy-chat.c:1295
+msgid "Unknown command; see /help for the available commands"
+msgstr "Unknown command; see /help for the available commands"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:13
-#, fuzzy
-msgid "Enable sounds when _busy"
-msgstr "Disable sounds when _busy"
+#: ../libempathy-gtk/empathy-chat.c:1541
+msgid "insufficient balance to send message"
+msgstr "insufficient balance to send message"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:14
-msgid "General"
-msgstr "General"
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1622
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Error sending message '%s': %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:15
-#, fuzzy
-msgid "Notifications"
-msgstr "Use notification sounds"
+#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564
+#: ../libempathy-gtk/empathy-chat.c:1626
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Error sending message: %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:16
-#, fuzzy
-msgid "Preferences"
-msgstr "_Preferences"
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1553
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "insufficient balance to send message. <a href='%s'>Top up</a>."
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:17
-msgid "Show _avatars"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1593
+msgid "not capable"
+msgstr "not capable"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:18
-#, fuzzy
-msgid "Show _smileys as images"
-msgstr "Convert _smileys to graphical images"
+#: ../libempathy-gtk/empathy-chat.c:1600
+msgid "offline"
+msgstr "offline"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:19
-#, fuzzy
-msgid "Show co_mpact contact list"
-msgstr "_Show Contact List"
+#: ../libempathy-gtk/empathy-chat.c:1603
+msgid "invalid contact"
+msgstr "invalid contact"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:20
-msgid "Sort by _name"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1606
+msgid "permission denied"
+msgstr "permission denied"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:21
-msgid "Sort by s_tate"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1609
+msgid "too long message"
+msgstr "too long message"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:22
-msgid "Spell Checking"
-msgstr "Spell Checking"
+#: ../libempathy-gtk/empathy-chat.c:1612
+msgid "not implemented"
+msgstr "not implemented"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:23
-msgid "Themes"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1616
+msgid "unknown"
+msgstr "unknown"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:24
-#, fuzzy
-msgid "_Enable spell checking"
-msgstr "Enable spell checking"
+#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916
+msgid "Topic:"
+msgstr "Topic:"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:25
-msgid "_Open new chats in separate windows"
-msgstr "_Open new chats in separate windows"
+#: ../libempathy-gtk/empathy-chat.c:1698
+#, c-format
+msgid "Topic set to: %s"
+msgstr "Topic set to: %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:26
-msgid "_Play sound when messages arrive"
-msgstr "_Play sound when messages arrive"
+#: ../libempathy-gtk/empathy-chat.c:1700
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Topic set by %s to: %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:27
-#, fuzzy
-msgid "_Use for chat rooms"
-msgstr "_Invite to Chat Room"
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1705
+msgid "No topic defined"
+msgstr "No topic defined"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:702
-#, fuzzy
-msgid "Custom message..."
-msgstr "_New Message..."
+#: ../libempathy-gtk/empathy-chat.c:2221
+msgid "(No Suggestions)"
+msgstr "(No Suggestions)"
 
-#. Clear list
-#: ../libempathy-gtk/gossip-presence-chooser.c:724
-#, fuzzy
-msgid "Clear List..."
-msgstr "Clear List"
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:2289
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "Add '%s' to Dictionary"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:803
-#, fuzzy
-msgid "Are you sure you want to clear the list?"
-msgstr "Do you want to accept this file?"
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:2326
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "Add '%s' to %s Dictionary"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:807
-msgid ""
-"This will remove any custom messages you have added to the list of preset "
-"status messages."
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:2396
+msgid "Insert Smiley"
+msgstr "Insert Smiley"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:812
-msgid "Clear List"
-msgstr "Clear List"
+#. send button
+#: ../libempathy-gtk/empathy-chat.c:2414
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
+msgid "_Send"
+msgstr "_Send"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:1
-msgid "Enter status message:"
-msgstr "Enter status message:"
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2471
+msgid "_Spelling Suggestions"
+msgstr "_Spelling Suggestions"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:2
-#, fuzzy
-msgid "Status Message Presets"
-msgstr "Add to status message list"
+#: ../libempathy-gtk/empathy-chat.c:2560
+msgid "Failed to retrieve recent logs"
+msgstr "Failed to retrieve recent logs"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:3
-#, fuzzy
-msgid "_Add to status message list"
-msgstr "Add to status message list"
+#: ../libempathy-gtk/empathy-chat.c:2699
+#, c-format
+msgid "%s has disconnected"
+msgstr "%s has disconnected"
 
-#: ../libempathy-gtk/gossip-private-chat.c:198
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2706
 #, c-format
-msgid "%s went offline"
-msgstr "%s went offline"
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s was kicked by %2$s"
 
-#: ../libempathy-gtk/gossip-private-chat.c:212
-#, fuzzy, c-format
-msgid "%s has come online"
-msgstr "%s comes online"
+#: ../libempathy-gtk/empathy-chat.c:2709
+#, c-format
+msgid "%s was kicked"
+msgstr "%s was kicked"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:87
-msgid "Classic"
-msgstr ""
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2717
+#, c-format
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s was banned by %2$s"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:88
-#, fuzzy
-msgid "Simple"
-msgstr "Example: %s"
+#: ../libempathy-gtk/empathy-chat.c:2720
+#, c-format
+msgid "%s was banned"
+msgstr "%s was banned"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:89
-#, fuzzy
-msgid "Clean"
-msgstr "C_lear"
+#: ../libempathy-gtk/empathy-chat.c:2724
+#, c-format
+msgid "%s has left the room"
+msgstr "%s has left the room"
+
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:2733
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:90
-#, fuzzy
-msgid "Blue"
-msgstr "Basque"
+#: ../libempathy-gtk/empathy-chat.c:2758
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s has joined the room"
 
-#: ../src/empathy-main.c:145
-msgid "Don't connect on startup"
-msgstr "Don't connect on startup"
+#: ../libempathy-gtk/empathy-chat.c:2783
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s is now known as %s"
+
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2970
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+msgid "Disconnected"
+msgstr "Disconnected"
 
-#: ../src/empathy-main.c:155
-#, fuzzy
-msgid "- Empathy Instant Messenger"
-msgstr "Gossip Instant Messenger"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3634
+msgid "Would you like to store this password?"
+msgstr "Would you like to store this password?"
 
-#~ msgid "Gossip Instant Messenger"
-#~ msgstr "Gossip Instant Messenger"
+#: ../libempathy-gtk/empathy-chat.c:3640
+msgid "Remember"
+msgstr "Remember"
 
-#, fuzzy
-#~ msgid "Joining"
-#~ msgstr "_Join"
+#: ../libempathy-gtk/empathy-chat.c:3650
+msgid "Not now"
+msgstr "Not now"
 
-#, fuzzy
-#~ msgid "Active"
-#~ msgstr "Actions"
+#: ../libempathy-gtk/empathy-chat.c:3694
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+msgid "Retry"
+msgstr "Retry"
 
-#~ msgid "Unknown"
-#~ msgstr "Unknown"
+#: ../libempathy-gtk/empathy-chat.c:3698
+msgid "Wrong password; please try again:"
+msgstr "Wrong password; please try again:"
 
-#, fuzzy
-#~ msgid "Error"
-#~ msgstr "Last Error"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3828
+msgid "This room is protected by a password:"
+msgstr "This room is protected by a password:"
 
-#, fuzzy
-#~ msgid "Participant"
-#~ msgid_plural "Participants"
-#~ msgstr[0] "Galician"
-#~ msgstr[1] "Galician"
+#: ../libempathy-gtk/empathy-chat.c:3855
+msgid "Join"
+msgstr "Join"
 
-#, fuzzy
-#~ msgid "No affiliation"
-#~ msgstr "Use notification sounds"
+#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301
+msgid "Connected"
+msgstr "Connected"
 
-#~ msgid "The nickname you have chosen is already in use."
-#~ msgstr "The nickname you have chosen is already in use."
+#: ../libempathy-gtk/empathy-chat.c:4102
+msgid "Conversation"
+msgstr "Conversation"
 
-#~ msgid "The chat room you tried to join requires a password."
-#~ msgstr "The chat room you tried to join requires a password."
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:4107
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+msgid "Unknown or invalid identifier"
+msgstr "Unknown or invalid identifier"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+msgid "Contact blocking temporarily unavailable"
+msgstr "Contact blocking temporarily unavailable"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+msgid "Contact blocking unavailable"
+msgstr "Contact blocking unavailable"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
+msgid "Permission Denied"
+msgstr "Permission Denied"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
+msgid "Could not block contact"
+msgstr "Could not block contact"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
+msgid "Edit Blocked Contacts"
+msgstr "Edit Blocked Contacts"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "Account:"
+msgstr "Account:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Blocked Contacts"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Remove"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
+msgid "_Copy Link Address"
+msgstr "_Copy Link Address"
 
-#~ msgid "The remote conference server did not respond in a sensible time."
-#~ msgstr "The remote conference server did not respond in a sensible time."
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
+msgid "_Open Link"
+msgstr "_Open Link"
 
-#~ msgid "The conference server you tried to join could not be found."
-#~ msgstr "The conference server you tried to join could not be found."
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
+msgid "%A %B %d %Y"
+msgstr "%A %B %e %Y"
 
-#, fuzzy
-#~ msgid "An unknown error occurred, check your details are correct."
-#~ msgstr "Ensure that your details are correct."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "New Contact"
 
-#, fuzzy
-#~ msgid "Unavailable"
-#~ msgstr "Service Unavailable"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
+#, c-format
+msgid "Block %s?"
+msgstr "Block %s?"
 
-#, fuzzy
-#~ msgid "An unknown error occurred."
-#~ msgstr "An unknown error occurred."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "Are you sure you want to block '%s' from contacting you again?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+msgid "_Block"
+msgstr "_Block"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "_Report this contact as abusive"
+msgstr[1] "_Report these contacts as abusive"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Subscription Request"
+msgstr "Subscription Request"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "_Block User"
+msgstr "_Block User"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decide _Later"
+
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
+msgid "Search contacts"
+msgstr "Search contacts"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+msgid "Search: "
+msgstr "Search: "
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+msgid "_Add Contact"
+msgstr "_Add Contact"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+msgid "No contacts found"
+msgstr "No contacts found"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+msgid "Your message introducing yourself:"
+msgstr "Your message introducing yourself:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Please let me see when you're online. Thanks!"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "Channels:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
+msgid "Country ISO Code:"
+msgstr "Country ISO Code:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "Country:"
+msgstr "Country:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "State:"
+msgstr "State:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "City:"
+msgstr "City:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Area:"
+msgstr "Area:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Postal Code:"
+msgstr "Postal Code:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Street:"
+msgstr "Street:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Building:"
+msgstr "Building:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Floor:"
+msgstr "Floor:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Room:"
+msgstr "Room:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "Text:"
+msgstr "Text:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
+msgid "Description:"
+msgstr "Description:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
+msgid "Accuracy Level:"
+msgstr "Accuracy Level:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
+msgid "Error:"
+msgstr "Error:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
+msgid "Vertical Error (meters):"
+msgstr "Vertical Error (metres):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
+msgid "Horizontal Error (meters):"
+msgstr "Horizontal Error (metres):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
+msgid "Speed:"
+msgstr "Speed:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
+msgid "Bearing:"
+msgstr "Bearing:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
+msgid "Climb Speed:"
+msgstr "Climb Speed:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
+msgid "Last Updated on:"
+msgstr "Last Updated on:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
+msgid "Longitude:"
+msgstr "Longitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
+msgid "Latitude:"
+msgstr "Latitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
+msgid "Altitude:"
+msgstr "Altitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
+msgid "Location"
+msgstr "Location"
+
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y at %I:%M %p UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
+msgid "Save Avatar"
+msgstr "Save Avatar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
+msgid "Unable to save avatar"
+msgstr "Unable to save avatar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personal Details"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Contact Details"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Full name"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Phone number"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-mail address"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Website"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Birthday"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Last seen:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Connected from:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Away message:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "work"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "home"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobile"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voice"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "preferred"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "parcel"
+
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Identifier:"
+
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Alias:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Location</b> at (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Information requested…"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Client Information"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "OS:"
+msgstr "OS:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "Version:"
+msgstr "Version:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Client:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
+msgid "Groups"
+msgstr "Groups"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:343
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
 
-#~ msgid "Connection refused."
-#~ msgstr "Connection refused."
+#: ../libempathy-gtk/empathy-groups-widget.c:362
+msgid "_Add Group"
+msgstr "_Add Group"
 
-#~ msgid "Server address could not be resolved."
-#~ msgstr "Server address could not be resolved."
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "Select"
 
-#~ msgid "Connection timed out."
-#~ msgstr "Connection timed out."
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1951
+msgid "Group"
+msgstr "Group"
 
-#~ msgid "Authentication failed."
-#~ msgstr "Authentication failed."
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] "The following identity will be blocked:"
+msgstr[1] "The following identities will be blocked:"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] "The following identity can not be blocked:"
+msgstr[1] "The following identities can not be blocked:"
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Edit Contact Information"
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:172
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:344
+msgid "Select account to use to place the call"
+msgstr "Select account to use to place the call"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
+msgid "Call"
+msgstr "Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:413
+msgid "Mobile"
+msgstr "Mobile"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:415
+msgid "Work"
+msgstr "Work"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:417
+msgid "HOME"
+msgstr "HOME"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Block Contact"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Chat"
 
-#, fuzzy
-#~ msgid "The username you are trying already exists."
-#~ msgstr "The nickname you have chosen is already in use."
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Previous Conversations"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Send File"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Share My Desktop"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favourite"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts not installed"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Please install gnome-contacts to access contacts details."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1377
+msgid "Infor_mation"
+msgstr "Infor_mation"
 
-#, fuzzy
-#~ msgid "The username you are trying is not valid."
-#~ msgstr "The nickname you have chosen is already in use."
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "_Edit"
 
-#, fuzzy
-#~ msgid "This feature is unavailable."
-#~ msgstr "No accounts available."
+#: ../libempathy-gtk/empathy-individual-menu.c:1543
+#: ../src/empathy-chat-window.c:1166
+msgid "Inviting you to this room"
+msgstr "Inviting you to this room"
 
-#, fuzzy
-#~ msgid "new account"
-#~ msgstr "Account"
+#: ../libempathy-gtk/empathy-individual-menu.c:1589
+msgid "_Invite to Chat Room"
+msgstr "_Invite to Chat Room"
 
-#~ msgid "Home"
-#~ msgstr "Home"
+#: ../libempathy-gtk/empathy-individual-menu.c:1785
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Add Contact…"
 
-#~ msgid "Couldn't send message!"
-#~ msgstr "Could not send message."
+#: ../libempathy-gtk/empathy-individual-view.c:2306
+msgid "Delete and _Block"
+msgstr "Delete and _Block"
 
-#~ msgid "Connection could not be opened"
-#~ msgstr "Connection could not be opened"
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Do you really want to remove the group '%s'?"
 
-#, fuzzy
-#~ msgid "This service is unavailable or not found"
-#~ msgstr "No accounts available."
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Removing group"
 
-#, fuzzy
-#~ msgid "Registration is required"
-#~ msgstr "Registration Required"
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Remove"
 
-#, fuzzy
-#~ msgid "There was an internal service error"
-#~ msgstr "Internal Server Error"
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Do you really want to remove the contact '%s'?"
 
-#, fuzzy
-#~ msgid "This feature is not implemented"
-#~ msgstr "No accounts available."
+#: ../libempathy-gtk/empathy-individual-view.c:2485
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
 
-#, fuzzy
-#~ msgid "The remote service timed out"
-#~ msgstr "Remote Server Timeout"
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Removing contact"
 
-#~ msgid "Disconnect"
-#~ msgstr "Disconnect"
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "Linked contact containing %u contact"
+msgstr[1] "Linked contacts containing %u contacts"
 
-#~ msgid "Connect"
-#~ msgstr "Connect"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>Location</b> at (date)"
 
-#, fuzzy
-#~ msgid "Successfully registered your new account settings."
-#~ msgstr "Successfully registered the account"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Online from a phone or mobile device"
+msgstr "Online from a phone or mobile device"
 
-#, fuzzy
-#~ msgid "Failed to register your new account settings."
-#~ msgstr "Failed registering the account"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
+msgid "New Network"
+msgstr "New Network"
 
-#, fuzzy
-#~ msgid "Successfully changed your account password."
-#~ msgstr "Please enter your password:"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+msgid "Choose an IRC network"
+msgstr "Choose an IRC network"
 
-#, fuzzy
-#~ msgid "Failed to change your account password."
-#~ msgstr "Please enter your password:"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+msgid "Reset _Networks List"
+msgstr "Reset _Networks List"
 
-#, fuzzy
-#~ msgid ""
-#~ "Please enter a new password for this account:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please enter a new name for the group:\n"
-#~ "%s"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Select"
 
-#~ msgid "No information is available for this contact."
-#~ msgstr "No information is available for this contact."
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+msgid "new server"
+msgstr "new server"
 
-#~ msgid "Information requested, please wait..."
-#~ msgstr "Information requested, please wait..."
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
+msgid "SSL"
+msgstr "SSL"
 
-#~ msgid "I would like to add you to my contact list."
-#~ msgstr "I would like to add you to my contact list."
+#: ../libempathy-gtk/empathy-log-window.c:622
+msgid "History"
+msgstr "History"
 
-#~ msgid "To summarize:"
-#~ msgstr "To summarize:"
+#: ../libempathy-gtk/empathy-log-window.c:677
+msgid "Show"
+msgstr "Show"
 
-#, fuzzy
-#~ msgid "%d new message"
-#~ msgid_plural "%d new messages"
-#~ msgstr[0] "_New Message..."
-#~ msgstr[1] "_New Message..."
+#: ../libempathy-gtk/empathy-log-window.c:699
+msgid "Search"
+msgstr "Search"
 
-#, fuzzy
-#~ msgid "%d subscription request"
-#~ msgid_plural "%d subscription requests"
-#~ msgstr[0] "Gossip - Subscription Request"
-#~ msgstr[1] "Gossip - Subscription Request"
+#: ../libempathy-gtk/empathy-log-window.c:1150
+#, c-format
+msgid "Chat in %s"
+msgstr "Chat in %s"
 
-#, fuzzy
-#~ msgid "%d file transfer request"
-#~ msgid_plural "%d file transfer requests"
-#~ msgstr[0] "Gossip - File Transfer Request"
-#~ msgstr[1] "Gossip - File Transfer Request"
+#: ../libempathy-gtk/empathy-log-window.c:1152
+#, c-format
+msgid "Chat with %s"
+msgstr "Chat with %s"
 
-#, fuzzy
-#~ msgid "%d server message"
-#~ msgid_plural "%d server messages"
-#~ msgstr[0] "Could not send message."
-#~ msgstr[1] "Could not send message."
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
 
-#, fuzzy
-#~ msgid "%d error"
-#~ msgid_plural "%d errors"
-#~ msgstr[0] "Last Error"
-#~ msgstr[1] "Last Error"
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1291
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
 
-#, fuzzy
-#~ msgid "If you quit, you will lose all unread information."
-#~ msgstr "If you quit, you will loose all unread information."
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1297
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
 
-#, fuzzy
-#~ msgid "Edit Account _Details"
-#~ msgstr "Edit your chat room details:"
+#: ../libempathy-gtk/empathy-log-window.c:1373
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s second"
+msgstr[1] "%s seconds"
 
-#~ msgid "Word"
-#~ msgstr "Word"
+#: ../libempathy-gtk/empathy-log-window.c:1380
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minute"
+msgstr[1] "%s minutes"
 
-#~ msgid "New message from %s"
-#~ msgstr "New message from %s"
+#: ../libempathy-gtk/empathy-log-window.c:1388
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Call took %s, ended at %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1722
+msgid "Today"
+msgstr "Today"
+
+#: ../libempathy-gtk/empathy-log-window.c:1726
+msgid "Yesterday"
+msgstr "Yesterday"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1741
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
+msgid "Anytime"
+msgstr "Anytime"
+
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
+msgid "Anyone"
+msgstr "Anyone"
+
+#: ../libempathy-gtk/empathy-log-window.c:2715
+msgid "Who"
+msgstr "Who"
+
+#: ../libempathy-gtk/empathy-log-window.c:2924
+msgid "When"
+msgstr "When"
+
+#: ../libempathy-gtk/empathy-log-window.c:3040
+msgid "Anything"
+msgstr "Anything"
+
+#: ../libempathy-gtk/empathy-log-window.c:3042
+msgid "Text chats"
+msgstr "Text chats"
+
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:25
+msgid "Calls"
+msgstr "Calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3049
+msgid "Incoming calls"
+msgstr "Incoming calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3050
+msgid "Outgoing calls"
+msgstr "Outgoing calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3051
+msgid "Missed calls"
+msgstr "Missed calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3073
+msgid "What"
+msgstr "What"
+
+#: ../libempathy-gtk/empathy-log-window.c:3782
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "Are you sure you want to delete all logs of previous conversations?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3786
+msgid "Clear All"
+msgstr "Clear All"
+
+#: ../libempathy-gtk/empathy-log-window.c:3793
+msgid "Delete from:"
+msgstr "Delete from:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "_File"
+msgstr "_File"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Edit"
 
-#, fuzzy
-#~ msgid "Your invitation has been declined"
-#~ msgstr "Your file transfer offer was declined."
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Delete All History..."
+msgstr "Delete All History..."
 
-#~ msgid "Accept"
-#~ msgstr "Accept"
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+msgid "Profile"
+msgstr "Profile"
 
-#, fuzzy
-#~ msgid "Name"
-#~ msgstr "Name:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Chat"
 
-#, fuzzy
-#~ msgid "Room"
-#~ msgstr "_Room:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "page 2"
+msgstr "page 2"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Loading...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "The contact is offline"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "The specified contact is either invalid or unknown"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "The contact does not support this kind of conversation"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "The requested functionality is not implemented for this protocol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Could not start a conversation with the given contact"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "You are banned from this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "This channel is full"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "You must be invited to join this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Can't proceed while disconnected"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "There was an error starting the conversation"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "Enter a contact identifier or phone number:"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
+msgid "New Conversation"
+msgstr "New Conversation"
+
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "_Video Call"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "_Audio Call"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+msgid "New Call"
+msgstr "New Call"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Authentification failed for account <b>%s</b>"
 
-#, fuzzy
-#~ msgid "Auto Connect"
-#~ msgstr "Stop Connecting"
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Enter your password for account\n"
+"<b>%s</b>"
+
+#. COL_STATUS_TEXT
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
+msgid "Custom Message…"
+msgstr "Custom Message…"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
+msgid "Edit Custom Messages…"
+msgstr "Edit Custom Messages…"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
+msgid "Click to remove this status as a favorite"
+msgstr "Click to remove this status as a favourite"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
+msgid "Click to make this status a favorite"
+msgstr "Click to make this status a favourite"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
+msgid "Set status"
+msgstr "Set status"
+
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+msgid "Custom messages…"
+msgstr "Custom messages…"
+
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "New %s account"
 
-#, fuzzy
-#~ msgid "Information requested..."
-#~ msgstr "Information requested, please wait..."
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "Find:"
 
-#, fuzzy
-#~ msgid "Do you want to remove this contact from your roster?"
-#~ msgstr ""
-#~ "Do you want to remove the contact\n"
-#~ "%s\n"
-#~ "from your contact list?"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "_Previous"
+msgstr "_Previous"
 
-#~ msgid ""
-#~ "Please enter a new name for the group:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please enter a new name for the group:\n"
-#~ "%s"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "_Next"
+msgstr "_Next"
 
-#~ msgid "Select"
-#~ msgstr "Select"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Mat_ch case"
 
-#~ msgid "Unsorted"
-#~ msgstr "Unsorted"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "Phrase not found"
+msgstr "Phrase not found"
 
-#~ msgid "New file transfer request from %s"
-#~ msgstr "New file transfer request from %s"
+#: ../libempathy-gtk/empathy-sound-manager.c:51
+msgid "Received an instant message"
+msgstr "Received an instant message"
 
-#~ msgid "File transfer is not supported by both parties."
-#~ msgstr "File transfer is not supported by both parties."
+#: ../libempathy-gtk/empathy-sound-manager.c:53
+msgid "Sent an instant message"
+msgstr "Sent an instant message"
 
-#~ msgid "Your file transfer offer declined."
-#~ msgstr "Your file transfer offer was declined."
+#: ../libempathy-gtk/empathy-sound-manager.c:55
+msgid "Incoming chat request"
+msgstr "Incoming chat request"
 
-#~ msgid "The other user decided not to continue."
-#~ msgstr "The other user decided not to continue."
+#: ../libempathy-gtk/empathy-sound-manager.c:57
+msgid "Contact connected"
+msgstr "Contact connected"
 
-#, fuzzy
-#~ msgid "Unknown error occurred during file transfer."
-#~ msgstr "Unknown error occured during file transfer."
+#: ../libempathy-gtk/empathy-sound-manager.c:59
+msgid "Contact disconnected"
+msgstr "Contact disconnected"
 
-#~ msgid "%s would like to send you a file."
-#~ msgstr "%s would like to send you a file."
+#: ../libempathy-gtk/empathy-sound-manager.c:61
+msgid "Connected to server"
+msgstr "Connected to server"
 
-#~ msgid "Someone would like to send you a file."
-#~ msgstr "Someone would like to send you a file."
+#: ../libempathy-gtk/empathy-sound-manager.c:63
+msgid "Disconnected from server"
+msgstr "Disconnected from server"
 
-#~ msgid "Select a file"
-#~ msgstr "Select a file"
+#: ../libempathy-gtk/empathy-sound-manager.c:65
+msgid "Incoming voice call"
+msgstr "Incoming voice call"
 
-#, fuzzy
-#~ msgid "Connecting..."
-#~ msgstr "Connecting"
+#: ../libempathy-gtk/empathy-sound-manager.c:67
+msgid "Outgoing voice call"
+msgstr "Outgoing voice call"
 
-#, fuzzy
-#~ msgid "Retry connection"
-#~ msgstr "Stop Connecting"
+#: ../libempathy-gtk/empathy-sound-manager.c:69
+msgid "Voice call ended"
+msgstr "Voice call ended"
 
-#~ msgid "Invited %s to join this chat conference."
-#~ msgstr "Invited %s to join this chat conference."
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+msgid "Edit Custom Messages"
+msgstr "Edit Custom Messages"
 
-#, fuzzy
-#~ msgid "Enter the new topic you want to set for this room:"
-#~ msgstr "What nickname do you want to use for this contact?"
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#, c-format
+msgid "Message edited at %s"
+msgstr "Message edited at %s"
 
-#, fuzzy
-#~ msgid "Topic: %s"
-#~ msgstr "_Topic:"
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
+msgid "Normal"
+msgstr "Normal"
 
-#~ msgid "Account"
-#~ msgstr "Account"
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Classic"
+msgstr "Classic"
 
-#, fuzzy
-#~ msgid "Conversation With"
-#~ msgstr "_Conversation"
+#: ../libempathy-gtk/empathy-theme-manager.c:71
+msgid "Simple"
+msgstr "Simple"
 
-#~ msgid "List the available accounts"
-#~ msgstr "List the available accounts"
+#: ../libempathy-gtk/empathy-theme-manager.c:72
+msgid "Clean"
+msgstr "Clean"
 
-#~ msgid "Which account to connect to on startup"
-#~ msgstr "Which account to connect to on startup"
+#: ../libempathy-gtk/empathy-theme-manager.c:73
+msgid "Blue"
+msgstr "Blue"
 
-#~ msgid "ACCOUNT-NAME"
-#~ msgstr "ACCOUNT-NAME"
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "The identity provided by the chat server cannot be verified."
 
-#~ msgid "No accounts available."
-#~ msgstr "No accounts available."
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "The certificate is not signed by a Certification Authority."
 
-#~ msgid "Available accounts:"
-#~ msgstr "Available accounts:"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "The certificate has expired."
 
-#~ msgid "[default]"
-#~ msgstr "[default]"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "The certificate hasn't yet been activated."
 
-#~ msgid "There is no account with the name '%s'."
-#~ msgstr "There is no account with the name '%s'."
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "The certificate does not have the expected fingerprint."
 
-#, fuzzy
-#~ msgid "Join"
-#~ msgstr "_Join"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr ""
+"The hostname verified by the certificate doesn't match the server name."
 
-#, fuzzy
-#~ msgid "Create"
-#~ msgstr "Chat"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "The certificate is self-signed."
 
-#, fuzzy
-#~ msgid "Chat Rooms"
-#~ msgstr "Chat Room:"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr ""
+"The certificate has been revoked by the issuing Certification Authority."
 
-#, fuzzy
-#~ msgid "Browsing for conference rooms, please wait..."
-#~ msgstr "Trying to join chat room, please wait..."
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "The certificate is cryptographically weak."
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "[default]"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "The certificate length exceeds verifiable limits."
 
-#, fuzzy
-#~ msgid "Chat!"
-#~ msgstr "Chat"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "The certificate is malformed."
 
-#~ msgid "%s wants to be added to your contact list."
-#~ msgstr "%s wants to be added to your contact list."
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "Expected hostname: %s"
 
-#~ msgid "Someone wants to be added to your contact list."
-#~ msgstr "Someone wants to be added to your contact list."
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "Certificate hostname: %s"
 
-#, fuzzy
-#~ msgid "Subscription request"
-#~ msgstr "Gossip - Subscription Request"
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
+msgid "Continue"
+msgstr "Continue"
 
-#, fuzzy
-#~ msgid "Contact Information"
-#~ msgstr "Contact _Information"
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Untrusted connection"
 
-#~ msgid "Suggestions for the word"
-#~ msgstr "Suggestions for the word"
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "This connection is untrusted. Would you like to continue anyway?"
 
-#~ msgid "New subscription request from %s"
-#~ msgstr "New subscription request from %s"
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
+msgid "Remember this choice for future connections"
+msgstr "Remember this choice for future connections"
 
-#~ msgid "Do you want to add this person to your contact list?"
-#~ msgstr "Do you want to add this person to your contact list?"
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
+msgid "Certificate Details"
+msgstr "Certificate Details"
 
-#~ msgid "Do you want to add %s to your contact list?"
-#~ msgstr "Do you want to add %s to your contact list?"
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
+msgid "Unable to open URI"
+msgstr "Unable to open URI"
 
-#, fuzzy
-#~ msgid "Please enter your %s account password"
-#~ msgstr "Please enter your password:"
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
+msgid "Select a file"
+msgstr "Select a file"
 
-#~ msgid "Remember Password?"
-#~ msgstr "Remember Password?"
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
+msgid "Insufficient free space to save file"
+msgstr "Insufficient free space to save file"
 
-#~ msgid "Could not display the help contents."
-#~ msgstr "Could not display the help contents."
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
 
-#, fuzzy
-#~ msgid "Select Your Avatar Image"
-#~ msgstr "Select another and try again"
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
+#, c-format
+msgid "Incoming file from %s"
+msgstr "Incoming file from %s"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+msgid "Current Locale"
+msgstr "Current Locale"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:161
+#: ../libempathy-gtk/totem-subtitle-encoding.c:163
+#: ../libempathy-gtk/totem-subtitle-encoding.c:165
+#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+msgid "Arabic"
+msgstr "Arabic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+msgid "Armenian"
+msgstr "Armenian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:173
+#: ../libempathy-gtk/totem-subtitle-encoding.c:175
+#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+msgid "Baltic"
+msgstr "Baltic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+msgid "Celtic"
+msgstr "Celtic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:183
+#: ../libempathy-gtk/totem-subtitle-encoding.c:185
+#: ../libempathy-gtk/totem-subtitle-encoding.c:187
+#: ../libempathy-gtk/totem-subtitle-encoding.c:189
+msgid "Central European"
+msgstr "Central European"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:192
+#: ../libempathy-gtk/totem-subtitle-encoding.c:194
+#: ../libempathy-gtk/totem-subtitle-encoding.c:196
+#: ../libempathy-gtk/totem-subtitle-encoding.c:198
+msgid "Chinese Simplified"
+msgstr "Chinese Simplified"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:201
+#: ../libempathy-gtk/totem-subtitle-encoding.c:203
+#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+msgid "Chinese Traditional"
+msgstr "Chinese Traditional"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+msgid "Croatian"
+msgstr "Croatian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:211
+#: ../libempathy-gtk/totem-subtitle-encoding.c:213
+#: ../libempathy-gtk/totem-subtitle-encoding.c:215
+#: ../libempathy-gtk/totem-subtitle-encoding.c:217
+#: ../libempathy-gtk/totem-subtitle-encoding.c:219
+#: ../libempathy-gtk/totem-subtitle-encoding.c:221
+msgid "Cyrillic"
+msgstr "Cyrillic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+msgid "Cyrillic/Russian"
+msgstr "Cyrillic/Russian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:227
+#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+msgid "Cyrillic/Ukrainian"
+msgstr "Cyrillic/Ukrainian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+msgid "Georgian"
+msgstr "Georgian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:235
+#: ../libempathy-gtk/totem-subtitle-encoding.c:237
+#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+msgid "Greek"
+msgstr "Greek"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:248
+#: ../libempathy-gtk/totem-subtitle-encoding.c:250
+#: ../libempathy-gtk/totem-subtitle-encoding.c:252
+#: ../libempathy-gtk/totem-subtitle-encoding.c:254
+msgid "Hebrew"
+msgstr "Hebrew"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+msgid "Hebrew Visual"
+msgstr "Hebrew Visual"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+msgid "Icelandic"
+msgstr "Icelandic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:266
+#: ../libempathy-gtk/totem-subtitle-encoding.c:268
+#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+msgid "Japanese"
+msgstr "Japanese"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:273
+#: ../libempathy-gtk/totem-subtitle-encoding.c:275
+#: ../libempathy-gtk/totem-subtitle-encoding.c:277
+#: ../libempathy-gtk/totem-subtitle-encoding.c:279
+msgid "Korean"
+msgstr "Korean"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+msgid "Nordic"
+msgstr "Nordic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+msgid "Persian"
+msgstr "Persian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:288
+#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+msgid "Romanian"
+msgstr "Romanian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+msgid "South European"
+msgstr "South European"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+msgid "Thai"
+msgstr "Thai"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:299
+#: ../libempathy-gtk/totem-subtitle-encoding.c:301
+#: ../libempathy-gtk/totem-subtitle-encoding.c:303
+#: ../libempathy-gtk/totem-subtitle-encoding.c:305
+msgid "Turkish"
+msgstr "Turkish"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:308
+#: ../libempathy-gtk/totem-subtitle-encoding.c:310
+#: ../libempathy-gtk/totem-subtitle-encoding.c:312
+#: ../libempathy-gtk/totem-subtitle-encoding.c:314
+#: ../libempathy-gtk/totem-subtitle-encoding.c:316
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:319
+#: ../libempathy-gtk/totem-subtitle-encoding.c:321
+#: ../libempathy-gtk/totem-subtitle-encoding.c:323
+#: ../libempathy-gtk/totem-subtitle-encoding.c:325
+#: ../libempathy-gtk/totem-subtitle-encoding.c:327
+msgid "Western"
+msgstr "Western"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:330
+#: ../libempathy-gtk/totem-subtitle-encoding.c:332
+#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+msgid "Vietnamese"
+msgstr "Vietnamese"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
+msgid "No error message"
+msgstr "No error message"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
+msgid "Instant Message (Empathy)"
+msgstr "Instant Message (Empathy)"
+
+#: ../src/empathy.c:437
+msgid "Don't connect on startup"
+msgstr "Don't connect on startup"
 
-#~ msgid "The server does not seem to be responding."
-#~ msgstr "The server does not seem to be responding."
+#: ../src/empathy.c:441
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "Don't display the contact list or any other dialogs on startup"
 
-#~ msgid "Try again later."
-#~ msgstr "Try again later."
+#: ../src/empathy.c:456
+msgid "- Empathy IM Client"
+msgstr "- Empathy IM Client"
 
-#, fuzzy
-#~ msgid "Change"
-#~ msgstr "Chat"
+#: ../src/empathy.c:643
+msgid "Error contacting the Account Manager"
+msgstr "Error contacting the Account Manager"
 
-#~ msgid "Contact goes offline"
-#~ msgstr "Contact goes offline"
+#: ../src/empathy.c:645
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+
+#: ../src/empathy-about-dialog.c:81
+msgid ""
+"Empathy is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+msgstr ""
+"Empathy is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public Licence as published by the Free Software "
+"Foundation; either version 2 of the Licence, or (at your option) any later "
+"version."
+
+#: ../src/empathy-about-dialog.c:85
+msgid ""
+"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for more "
+"details."
 
-#~ msgid "Contact goes online"
-#~ msgstr "Contact goes online"
+#: ../src/empathy-about-dialog.c:89
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr ""
+"You should have received a copy of the GNU General Public Licence along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#~ msgid "Contact ID:"
-#~ msgstr "Contact ID:"
+#: ../src/empathy-about-dialog.c:109
+msgid "An Instant Messaging client for GNOME"
+msgstr "An Instant Messaging client for GNOME"
 
-#~ msgid "Do you want to accept this file?"
-#~ msgstr "Do you want to accept this file?"
+#: ../src/empathy-about-dialog.c:115
+msgid "translator-credits"
+msgstr ""
+"Adam Weinberger\n"
+"Tiffany Antopolski"
 
-#, fuzzy
-#~ msgid "File Transfer Request"
-#~ msgstr "Gossip - File Transfer Request"
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
+msgstr "There was an error while importing the accounts."
 
-#~ msgid "File name:"
-#~ msgstr "File name:"
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
+msgstr "There was an error while parsing the account details."
 
-#~ msgid "File size:"
-#~ msgstr "File size:"
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
+msgstr "There was an error while creating the account."
 
-#, fuzzy
-#~ msgid "Not supported yet"
-#~ msgstr "Not supported yet."
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
+msgstr "There was an error."
 
-#~ msgid "This person wishes to send you this file:"
-#~ msgstr "This person wishes to send you this file:"
+#: ../src/empathy-account-assistant.c:179
+#, c-format
+msgid "The error message was: %s"
+msgstr "The error message was: %s"
 
-#~ msgid "Web site:"
-#~ msgstr "Web site:"
+#: ../src/empathy-account-assistant.c:183
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
 
-#~ msgid "_Accept"
-#~ msgstr "_Accept"
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1276
+msgid "An error occurred"
+msgstr "An error occurred"
 
-#~ msgid "_Deny"
-#~ msgstr "_Deny"
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "What kind of chat account do you have?"
 
-#, fuzzy
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>About</b>"
+#: ../src/empathy-account-assistant.c:475
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "Do you have any other chat accounts you want to set up?"
 
-#~ msgid "Account:"
-#~ msgstr "Account:"
+#: ../src/empathy-account-assistant.c:481
+msgid "Enter your account details"
+msgstr "Enter your account details"
 
-#, fuzzy
-#~ msgid "Browse:"
-#~ msgstr "Faroese"
+#: ../src/empathy-account-assistant.c:486
+msgid "What kind of chat account do you want to create?"
+msgstr "What kind of chat account do you want to create?"
 
-#, fuzzy
-#~ msgid "Edit Favorite Room"
-#~ msgstr "Gossip - Edit Chat Room"
+#: ../src/empathy-account-assistant.c:492
+msgid "Do you want to create other chat accounts?"
+msgstr "Do you want to create other chat accounts?"
 
-#, fuzzy
-#~ msgid "Group Chat"
-#~ msgstr "Gossip - Chat"
+#: ../src/empathy-account-assistant.c:499
+msgid "Enter the details for the new account"
+msgstr "Enter the details for the new account"
 
-#, fuzzy
-#~ msgid "Join New"
-#~ msgstr "_Join"
+#: ../src/empathy-account-assistant.c:614
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+
+#: ../src/empathy-account-assistant.c:631
+msgid "Do you have an account you've been using with another chat program?"
+msgstr "Do you have an account you've been using with another chat program?"
+
+#: ../src/empathy-account-assistant.c:655
+msgid "Yes, import my account details from "
+msgstr "Yes, import my account details from "
+
+#: ../src/empathy-account-assistant.c:676
+msgid "Yes, I'll enter my account details now"
+msgstr "Yes, I'll enter my account details now"
+
+#: ../src/empathy-account-assistant.c:698
+msgid "No, I want a new account"
+msgstr "No, I want a new account"
+
+#: ../src/empathy-account-assistant.c:708
+msgid "No, I just want to see people online nearby for now"
+msgstr "No, I just want to see people online nearby for now"
+
+#: ../src/empathy-account-assistant.c:729
+msgid "Select the accounts you want to import:"
+msgstr "Select the accounts you want to import:"
+
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Yes"
+
+#: ../src/empathy-account-assistant.c:823
+msgid "No, that's all for now"
+msgstr "No, that's all for now"
+
+#: ../src/empathy-account-assistant.c:1088
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
 
-#, fuzzy
-#~ msgid "Join room on start_up"
-#~ msgstr "Join Room on Start_up"
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1152
+msgid "Edit->Accounts"
+msgstr "Edit->Accounts"
 
-#~ msgid "N_ame:"
-#~ msgstr "N_ame:"
+#: ../src/empathy-account-assistant.c:1110
+msgid "I do _not want to enable this feature for now"
+msgstr "I do _not want to enable this feature for now"
 
-#~ msgid "S_erver:"
-#~ msgstr "S_erver:"
+#: ../src/empathy-account-assistant.c:1148
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+msgstr ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+
+#: ../src/empathy-account-assistant.c:1154
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut not installed"
+
+#: ../src/empathy-account-assistant.c:1200
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "Messaging and VoIP Accounts Assistant"
+
+#: ../src/empathy-account-assistant.c:1234
+msgid "Welcome to Empathy"
+msgstr "Welcome to Empathy"
+
+#: ../src/empathy-account-assistant.c:1243
+msgid "Import your existing accounts"
+msgstr "Import your existing accounts"
+
+#: ../src/empathy-account-assistant.c:1261
+msgid "Please enter personal details"
+msgstr "Please enter personal details"
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:69
+#, c-format
+msgid "There are unsaved modifications to your %s account."
+msgstr "There are unsaved modifications to your %s account."
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:73
+msgid "Your new account has not been saved yet."
+msgstr "Your new account has not been saved yet."
+
+#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
+msgid "Connecting…"
+msgstr "Connecting…"
+
+#: ../src/empathy-accounts-dialog.c:385
+#, c-format
+msgid "Offline — %s"
+msgstr "Offline — %s"
 
-#~ msgid "_Nickname:"
-#~ msgstr "_Nickname:"
+#: ../src/empathy-accounts-dialog.c:397
+#, c-format
+msgid "Disconnected — %s"
+msgstr "Disconnected — %s"
 
-#~ msgid "_Room:"
-#~ msgstr "_Room:"
+#: ../src/empathy-accounts-dialog.c:408
+msgid "Offline — No Network Connection"
+msgstr "Offline — No Network Connection"
 
-#~ msgid "-"
-#~ msgstr "-"
+#: ../src/empathy-accounts-dialog.c:415
+msgid "Unknown Status"
+msgstr "Unknown Status"
 
-#~ msgid "<b>About</b>"
-#~ msgstr "<b>About</b>"
+#: ../src/empathy-accounts-dialog.c:427
+msgid "Offline — Account Disabled"
+msgstr "Offline — Account Disabled"
 
-#~ msgid "<b>Client Information</b>"
-#~ msgstr "<b>Client Information</b>"
+#: ../src/empathy-accounts-dialog.c:530
+msgid "Edit Connection Parameters"
+msgstr "Edit Connection Parametres"
 
-#, fuzzy
-#~ msgid "<b>Groups</b>"
-#~ msgstr "<b>About</b>"
+#: ../src/empathy-accounts-dialog.c:693
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Failed to retrieve your personal information from the server."
 
-#, fuzzy
-#~ msgid "<b>Name</b>"
-#~ msgstr "<b>Languages</b>"
+#: ../src/empathy-accounts-dialog.c:699
+msgid "Go online to edit your personal information."
+msgstr "Go online to edit your personal information."
 
-#~ msgid "<b>Personal Details</b>"
-#~ msgstr "<b>Personal Details</b>"
+#: ../src/empathy-accounts-dialog.c:784
+msgid "_Edit Connection Parameters..."
+msgstr "_Edit Connection Parametres..."
 
-#, fuzzy
-#~ msgid "<b>Subscription</b>"
-#~ msgstr "Connection"
+#: ../src/empathy-accounts-dialog.c:1289
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr "Do you want to remove %s from your computer?"
 
-#~ msgid "<span size=\"smaller\">Example: Mikael or user@server.org</span>"
-#~ msgstr "<span size=\"smaller\">Example: Mikael or user@server.org</span>"
+#: ../src/empathy-accounts-dialog.c:1293
+msgid "This will not remove your account on the server."
+msgstr "This will not remove your account on the server."
 
-#, fuzzy
-#~ msgid "Accou_nt:"
-#~ msgstr "Account:"
+#: ../src/empathy-accounts-dialog.c:1529
+msgid ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
 
-#, fuzzy
-#~ msgid "Add Contact"
-#~ msgstr "_Add Contact..."
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1705
+msgid "_Enable"
+msgstr "_Enable"
 
-#, fuzzy
-#~ msgid "Alia_s:"
-#~ msgstr "Alias:"
+#: ../src/empathy-accounts-dialog.c:1706
+msgid "_Disable"
+msgstr "_Disable"
 
-#~ msgid "Ch_at"
-#~ msgstr "Ch_at"
+#: ../src/empathy-accounts-dialog.c:2176
+msgid ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
 
-#~ msgid "Client:"
-#~ msgstr "Client:"
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Add…"
 
-#, fuzzy
-#~ msgid "Con_tact:"
-#~ msgstr "_Add Contact..."
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "_Import…"
+msgstr "_Import…"
 
-#, fuzzy
-#~ msgid "Connect on S_tartup"
-#~ msgstr "Connect on Start_up"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Protocol:"
+msgstr "Protocol:"
 
-#, fuzzy
-#~ msgid "Contacts"
-#~ msgstr "_Add Contact..."
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
 
-#~ msgid "Country:"
-#~ msgstr "Country:"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "No protocol installed"
 
-#~ msgid "Decide _Later"
-#~ msgstr "Decide _Later"
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Loading account information"
+msgstr "Loading account information"
 
-#, fuzzy
-#~ msgid "Edit Contact"
-#~ msgstr "_Add Contact..."
+#: ../src/empathy-auth-client.c:286
+msgid " - Empathy authentication client"
+msgstr " - Empathy authentication client"
 
-#, fuzzy
-#~ msgid "Edit Groups"
-#~ msgstr "/_Edit Groups"
+#: ../src/empathy-auth-client.c:302
+msgid "Empathy authentication client"
+msgstr "Empathy authentication client"
 
-#~ msgid "Email:"
-#~ msgstr "Email:"
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "People nearby"
 
-#~ msgid "ID:"
-#~ msgstr "ID:"
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy Audio/Video Client"
 
-#~ msgid ""
-#~ "If you chose to decide later you will be asked the next time you log on."
-#~ msgstr ""
-#~ "If you chose to decide later you will be asked the next time you log on."
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy Audio/Video Client"
 
-#~ msgid "Name:"
-#~ msgstr "Name:"
+#: ../src/empathy-streamed-media-window.c:433
+msgid "Contrast"
+msgstr "Contrast"
 
-#~ msgid "OS:"
-#~ msgstr "OS:"
+#: ../src/empathy-streamed-media-window.c:436
+msgid "Brightness"
+msgstr "Brightness"
 
-#, fuzzy
-#~ msgid "Personal Details"
-#~ msgstr "Personal Details Saved!"
+#: ../src/empathy-streamed-media-window.c:439
+msgid "Gamma"
+msgstr "Gamma"
 
-#, fuzzy
-#~ msgid "R_egister"
-#~ msgstr "Registration Required"
+#: ../src/empathy-streamed-media-window.c:545
+msgid "Volume"
+msgstr "Volume"
 
-#, fuzzy
-#~ msgid "Search"
-#~ msgstr "_Search..."
+#: ../src/empathy-streamed-media-window.c:1097
+msgid "_Sidebar"
+msgstr "_Sidebar"
 
-#, fuzzy
-#~ msgid "Spell Checker"
-#~ msgstr "Spell Checking"
+#: ../src/empathy-streamed-media-window.c:1117
+msgid "Audio input"
+msgstr "Audio input"
 
-#, fuzzy
-#~ msgid "Subscription Request"
-#~ msgstr "Gossip - Subscription Request"
+#: ../src/empathy-streamed-media-window.c:1121
+msgid "Video input"
+msgstr "Video input"
 
-#~ msgid "Suggestions for the word:"
-#~ msgstr "Suggestions for the word:"
+#: ../src/empathy-streamed-media-window.c:1129
+msgid "Dialpad"
+msgstr "Dialpad"
 
-#, fuzzy
-#~ msgid ""
-#~ "This acts as a filter to the contact list below. You can use segments of "
-#~ "contact's name or ID, for example, \"jabber.org\" will list everyone "
-#~ "using that server"
-#~ msgstr ""
-#~ "This acts as a filter of the contact list below.  You can use segments of "
-#~ "contact's name or ID; for example, \"jabber.org\" will list everyone "
-#~ "using that server. "
+#: ../src/empathy-streamed-media-window.c:1140
+msgid "Details"
+msgstr "Details"
 
-#, fuzzy
-#~ msgid "This is the name that will be used on your roster for this contact"
-#~ msgstr "This is the name that will be used on your roster for this contact."
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
+#, c-format
+msgid "Call with %s"
+msgstr "Call with %s"
+
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
+msgid "The IP address as seen by the machine"
+msgstr "The IP address as seen by the machine"
+
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
+msgid "The IP address as seen by a server on the Internet"
+msgstr "The IP address as seen by a server on the Internet"
+
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
+msgid "The IP address of the peer as seen by the other side"
+msgstr "The IP address of the peer as seen by the other side"
+
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
+msgid "The IP address of a relay server"
+msgstr "The IP address of a relay server"
+
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
+msgid "The IP address of the multicast group"
+msgstr "The IP address of the multicast group"
+
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+msgctxt "codec"
+msgid "Unknown"
+msgstr "Unknown"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-streamed-media-window.c:2139
+#, c-format
+msgid "Connected — %d:%02dm"
+msgstr "Connected — %d:%02dm"
 
-#, fuzzy
-#~ msgid "This name will be used to identify you in chat windows"
-#~ msgstr "This name will be used to identify you in chat windows."
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
+msgid "Technical Details"
+msgstr "Technical Details"
 
-#, fuzzy
-#~ msgid ""
-#~ "This name will be used to identify you when new contacts lookup your "
-#~ "details"
-#~ msgstr "This name will be used to identify you in chat windows."
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
 
-#~ msgid "Use system pro_xy"
-#~ msgstr "Use system pro_xy"
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
 
-#~ msgid "Version:"
-#~ msgstr "Version:"
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
 
-#, fuzzy
-#~ msgid "View Previous Conversations"
-#~ msgstr "_Conversation"
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
+msgid "There was a failure on the network"
+msgstr "There was a failure on the network"
 
-#, fuzzy
-#~ msgid "Which account do you want to use?"
-#~ msgstr "Which username do you want to use?"
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"The audio formats necessary for this call are not installed on your computer"
 
-#~ msgid "You are not subscribed to this contact."
-#~ msgstr "You are not subscribed to this contact."
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"The video formats necessary for this call are not installed on your computer"
 
-#~ msgid "_Connect"
-#~ msgstr "_Connect"
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
+msgid "There was a failure in the call engine"
+msgstr "There was a failure in the call engine"
+
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
+msgid "The end of the stream was reached"
+msgstr "The end of the stream was reached"
+
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
+msgid "Can't establish audio stream"
+msgstr "Can't establish audio stream"
+
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
+msgid "Can't establish video stream"
+msgstr "Can't establish video stream"
+
+#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-streamed-media-window.ui.h:1
+msgid "_Call"
+msgstr "_Call"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "_Microphone"
+msgstr "_Microphone"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "_Camera"
+msgstr "_Camera"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "_Settings"
+msgstr "_Settings"
+
+#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_View"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Help"
 
-#, fuzzy
-#~ msgid "_Description:"
-#~ msgstr "Description:"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Contents"
 
-#~ msgid "_Disconnect"
-#~ msgstr "_Disconnect"
+#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Debug"
+
+#: ../src/empathy-call-window.ui.h:10
+msgid "Swap camera"
+msgstr "Swap camera"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "Minimise me"
+
+#: ../src/empathy-call-window.ui.h:12
+msgid "Maximise me"
+msgstr "Maximise me"
+
+#: ../src/empathy-call-window.ui.h:13
+msgid "Disable camera"
+msgstr "Disable camera"
+
+#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Hang up"
+
+#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Hang up current call"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video call"
+
+#: ../src/empathy-call-window.ui.h:17
+msgid "Start a video call"
+msgstr "Start a video call"
+
+#: ../src/empathy-call-window.ui.h:19
+msgid "Start an audio call"
+msgstr "Start an audio call"
+
+#: ../src/empathy-call-window.ui.h:20
+msgid "Show dialpad"
+msgstr "Show dialpad"
+
+#: ../src/empathy-call-window.ui.h:21
+msgid "Display the dialpad"
+msgstr "Display the dialpad"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Send Video"
+
+#: ../src/empathy-call-window.ui.h:23
+msgid "Toggle video transmission"
+msgstr "Toggle video transmission"
+
+#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Send Audio"
+
+#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Toggle audio transmission"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Encoding Codec:"
+
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Decoding Codec:"
+
+#: ../src/empathy-call-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Remote Candidate:"
+
+#: ../src/empathy-call-window.ui.h:31
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Local Candidate:"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:25
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/empathy-chat-window.c:285
+msgid "Close this window?"
+msgstr "Close this window?"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
 
-#, fuzzy
-#~ msgid "_Email:"
-#~ msgstr "Email:"
+#: ../src/empathy-chat-window.c:301
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgstr[1] ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+msgid "Leave %s?"
+msgstr "Leave %s?"
 
-#, fuzzy
-#~ msgid ""
-#~ "_Enter the name or contact ID of the person you want to chat to below:"
-#~ msgstr ""
-#~ "Enter the name or contact ID of the person you want to chat with below:"
+#: ../src/empathy-chat-window.c:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
 
-#, fuzzy
-#~ msgid "_For:"
-#~ msgstr "Por_t:"
+#: ../src/empathy-chat-window.c:330
+msgid "Close window"
+msgstr "Close window"
 
-#, fuzzy
-#~ msgid "_Full Name:"
-#~ msgstr "_Name:"
+#: ../src/empathy-chat-window.c:330
+msgid "Leave room"
+msgstr "Leave room"
 
-#, fuzzy
-#~ msgid "_Group:"
-#~ msgstr "Group:"
+#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d unread)"
+msgstr[1] "%s (%d unread)"
 
-#, fuzzy
-#~ msgid "_Nick Name:"
-#~ msgstr "_Nickname:"
+#: ../src/empathy-chat-window.c:648
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (and %u other)"
+msgstr[1] "%s (and %u others)"
 
-#, fuzzy
-#~ msgid "_Password:"
-#~ msgstr "_Password:"
+#: ../src/empathy-chat-window.c:664
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d unread from others)"
+msgstr[1] "%s (%d unread from others)"
 
-#, fuzzy
-#~ msgid "_Quit Message:"
-#~ msgstr "_New Message..."
+#: ../src/empathy-chat-window.c:673
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d unread from all)"
+msgstr[1] "%s (%d unread from all)"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Subscribe"
+#: ../src/empathy-chat-window.c:888
+msgid "SMS:"
+msgstr "SMS:"
 
-#, fuzzy
-#~ msgid "_Web site:"
-#~ msgstr "Web site:"
+#: ../src/empathy-chat-window.c:898
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Sending %d message"
+msgstr[1] "Sending %d messages"
 
-#~ msgid "Preset status messages"
-#~ msgstr "Preset status messages"
+#: ../src/empathy-chat-window.c:920
+msgid "Typing a message."
+msgstr "Typing a message."
 
-#~ msgid "Preset status messages."
-#~ msgstr "Preset status messages."
+#: ../src/empathy-chat-window.ui.h:1
+msgid "_Conversation"
+msgstr "_Conversation"
 
-#~ msgid "Connecting"
-#~ msgstr "Connecting"
+#: ../src/empathy-chat-window.ui.h:2
+msgid "C_lear"
+msgstr "C_lear"
 
-#~ msgid "Perhaps you are trying to connect to the wrong port?"
-#~ msgstr "Perhaps you are trying to connect to the wrong port?"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "Insert _Smiley"
 
-#~ msgid "Perhaps the service is not currently running?"
-#~ msgstr "Perhaps the service is not currently running?"
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Favourite Chat Room"
 
-#~ msgid "Check your connection details."
-#~ msgstr "Check your connection details."
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Notify for All Messages"
+msgstr "Notify for All Messages"
 
-#~ msgid "Perhaps the server is not running this service."
-#~ msgstr "Perhaps the server is not running this service."
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Show Contact List"
 
-#~ msgid "Check your username and password are correct."
-#~ msgstr "Ensure that your username and password are correct."
+#: ../src/empathy-chat-window.ui.h:7
+msgid "Invite _Participant…"
+msgstr "Invite _Participant…"
 
-#~ msgid "%s will be added to your contact list."
-#~ msgstr "%s will be added to your contact list."
+#: ../src/empathy-chat-window.ui.h:8
+msgid "C_ontact"
+msgstr "C_ontact"
 
-#~ msgid "%s ID of new contact:"
-#~ msgstr "%s ID of new contact:"
+#: ../src/empathy-chat-window.ui.h:10
+msgid "_Tabs"
+msgstr "_Tabs"
 
-#~ msgid "Example: %s"
-#~ msgstr "Example: %s"
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Previous Tab"
+msgstr "_Previous Tab"
 
-#~ msgid "You have no Instant Messaging accounts configured!"
-#~ msgstr "You have no Instant Messaging accounts configured!"
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "_Next Tab"
 
-#~ msgid ""
-#~ "Next you will be presented with the Account Information dialog to set "
-#~ "your details up."
-#~ msgstr ""
-#~ "Next you will be presented with the Account Information dialogue to set "
-#~ "up your details."
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Undo Close Tab"
 
-#~ msgid ""
-#~ "Please enter your invitation message to:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please enter your invitation message to:\n"
-#~ "%s"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Move Tab _Left"
 
-#, fuzzy
-#~ msgid "Favourite"
-#~ msgstr "_Add to Favourites"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Move Tab _Right"
 
-#~ msgid "Contact Information for %s"
-#~ msgstr "Contact Information for %s"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Detach Tab"
 
-#, fuzzy
-#~ msgid "/Contact Infor_mation"
-#~ msgstr "/Contact _Information"
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "Name"
 
-#~ msgid "/Re_name Contact"
-#~ msgstr "/Re_name Contact"
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "Room"
 
-#~ msgid "/_Edit Groups"
-#~ msgstr "/_Edit Groups"
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "Auto-Connect"
 
-#, fuzzy
-#~ msgid "/_View Previous Conversations"
-#~ msgstr "_Conversation"
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "Manage Favourite Rooms"
 
-#~ msgid ""
-#~ "Please enter a new nickname for the contact\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please enter a new nickname for the contact\n"
-#~ "%s"
-
-#~ msgid "Edit groups for %s"
-#~ msgstr "Edit groups for %s"
-
-#~ msgid "Conversation Log"
-#~ msgstr "Conversation Log"
-
-#~ msgid "Registering account"
-#~ msgstr "Registering account"
-
-#, fuzzy
-#~ msgid "Respond"
-#~ msgstr "Reason:"
-
-#, fuzzy
-#~ msgid "Add to _favourites"
-#~ msgstr "_Add to Favourites"
-
-#, fuzzy
-#~ msgid ""
-#~ "Customize your own nickname, the server and chatroom which you wish to "
-#~ "join."
-#~ msgstr ""
-#~ "Pick a saved chat room or customize your own nickname, server and chat "
-#~ "room to join."
-
-#, fuzzy
-#~ msgid "Na_me:"
-#~ msgstr "Name:"
-
-#, fuzzy
-#~ msgid "New Chat Room"
-#~ msgstr "Chat Room:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Pick a saved chat room from the presets available below and click Join to "
-#~ "start chatting."
-#~ msgstr ""
-#~ "Pick a saved chat room or customize your own nickname, server and chat "
-#~ "room to join."
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "<b>Information requested, please wait...</b>"
-#~ msgstr "<b>Information requested, please wait...</b>"
-
-#, fuzzy
-#~ msgid "<span size=\"smaller\">Example:</span>"
-#~ msgstr "<span size=\"smaller\">Example: user@jabber.org</span>"
-
-#~ msgid "Account Name"
-#~ msgstr "Account Name"
-
-#, fuzzy
-#~ msgid "Chat Rooms..."
-#~ msgstr "Chat Room:"
-
-#, fuzzy
-#~ msgid "Connection Details"
-#~ msgstr "Connection"
-
-#~ msgid "Do you already have an account set up on a server?"
-#~ msgstr "Do you already have an account set up on a server?"
-
-#, fuzzy
-#~ msgid "Enter the port used in the connection for this account"
-#~ msgstr ""
-#~ "Please enter a new nickname for the contact\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Enter the server used in the connection for this account"
-#~ msgstr ""
-#~ "Please enter a new nickname for the contact\n"
-#~ "%s"
-
-#~ msgid "Enter the user's contact ID:"
-#~ msgstr "Enter the user's contact ID:"
-
-#~ msgid "Finished"
-#~ msgstr "Finished"
-
-#~ msgid "Gossip"
-#~ msgstr "Gossip"
-
-#~ msgid ""
-#~ "Gossip is a modern client for the Jabber Instant Messaging system.\n"
-#~ "\n"
-#~ "This assistant will help you configure Gossip and connect you to your "
-#~ "favorite Jabber server.\n"
-#~ "\n"
-#~ "To get started, just click \"Forward\"."
-#~ msgstr ""
-#~ "Gossip is a modern client for the Jabber Instant Messaging system.\n"
-#~ "\n"
-#~ "This assistant will help you configure Gossip and connect you to your "
-#~ "favourite Jabber server.\n"
-#~ "\n"
-#~ "To get started, just click \"Forward\"."
-
-#~ msgid ""
-#~ "In order to subscribe to presence notifications from the user, a request "
-#~ "will be sent. Until this request is approved, the user will always be "
-#~ "shown as \"Offline\" in your contact list."
-#~ msgstr ""
-#~ "In order to subscribe to presence notifications from the user, a request "
-#~ "will be sent. Until this request is approved, the user will always be "
-#~ "shown as \"Offline\" in your contact list."
-
-#~ msgid "In which group do you want to place this contact?"
-#~ msgstr "In which group do you want to place this contact?"
+#: ../src/empathy-event-manager.c:523
+msgid "Incoming video call"
+msgstr "Incoming video call"
 
-#~ msgid "Jabber ID:"
-#~ msgstr "Jabber ID:"
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+msgid "Incoming call"
+msgstr "Incoming call"
 
-#~ msgid "Nickname:"
-#~ msgstr "Nickname:"
+#: ../src/empathy-event-manager.c:527
+#, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s is video calling you. Do you want to answer?"
 
-#, fuzzy
-#~ msgid "Port:"
-#~ msgstr "Por_t:"
+#: ../src/empathy-event-manager.c:528
+#, c-format
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s is calling you. Do you want to answer?"
 
-#, fuzzy
-#~ msgid "Press Subscribe to request to receive their status"
-#~ msgstr "Press Subscribe to request to receive their status."
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Incoming call from %s"
 
-#, fuzzy
-#~ msgid "Registering Account"
-#~ msgstr "Registering account"
+#: ../src/empathy-event-manager.c:556
+msgid "_Reject"
+msgstr "_Reject"
 
-#, fuzzy
-#~ msgid "Resource:"
-#~ msgstr "R_esource:"
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+msgid "_Answer"
+msgstr "_Answer"
 
-#~ msgid "Sending request"
-#~ msgstr "Sending request"
+#: ../src/empathy-event-manager.c:572
+msgid "_Answer with video"
+msgstr "_Answer with video"
 
-#, fuzzy
-#~ msgid "Server:"
-#~ msgstr "_Server:"
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "Incoming video call from %s"
 
-#~ msgid "Web Site:"
-#~ msgstr "Web Site:"
+#: ../src/empathy-event-manager.c:838
+msgid "Room invitation"
+msgstr "Room invitation"
 
-#~ msgid "Welcome to Gossip"
-#~ msgstr "Welcome to Gossip"
+#: ../src/empathy-event-manager.c:840
+#, c-format
+msgid "Invitation to join %s"
+msgstr "Invitation to join %s"
 
-#~ msgid "What instant messaging system does the contact use?"
-#~ msgstr "Which instant messaging system does the contact use?"
+#: ../src/empathy-event-manager.c:847
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr "%s is inviting you to join %s"
 
-#~ msgid "What is your name?"
-#~ msgstr "What is your name?"
+#: ../src/empathy-event-manager.c:855
+msgid "_Decline"
+msgstr "_Decline"
 
-#, fuzzy
-#~ msgid "What password do you want to use?"
-#~ msgstr "What server do you want to use?"
+#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "_Join"
+msgstr "_Join"
 
-#~ msgid "What username do you use?"
-#~ msgstr "What username do you use?"
+#: ../src/empathy-event-manager.c:887
+#, c-format
+msgid "%s invited you to join %s"
+msgstr "%s invited you to join %s"
 
-#~ msgid "What username do you want to use?"
-#~ msgstr "Which username do you want to use?"
+#: ../src/empathy-event-manager.c:893
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "You have been invited to join %s"
 
-#~ msgid "Which account do you want to add this contact to?"
-#~ msgstr "To which account do you want to add this contact?"
+#: ../src/empathy-event-manager.c:944
+#, c-format
+msgid "Incoming file transfer from %s"
+msgstr "Incoming file transfer from %s"
 
-#~ msgid ""
-#~ "You can change your account settings later by selecting the Edit-"
-#~ ">Accounts menu item."
-#~ msgstr ""
-#~ "You can change your account settings later by selecting the Edit-"
-#~ ">Accounts menu item."
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372
+msgid "Password required"
+msgstr "Password required"
 
-#~ msgid "Your Account"
-#~ msgstr "Your Account"
+#: ../src/empathy-event-manager.c:1217
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s would like permission to see when you are online"
 
-#~ msgid "Your Identity"
-#~ msgstr "Your Identity"
+#: ../src/empathy-event-manager.c:1223
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr ""
+"\n"
+"Message: %s"
 
-#~ msgid "Your new account has now been set up."
-#~ msgstr "Your new account has now been set up."
+#. Translators: time left, when it is more than one hour
+#: ../src/empathy-ft-manager.c:99
+#, c-format
+msgid "%u:%02u.%02u"
+msgstr "%u:%02u.%02u"
 
-#, fuzzy
-#~ msgid "_Group Chat"
-#~ msgstr "Gossip - Chat"
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:102
+#, c-format
+msgid "%02u.%02u"
+msgstr "%02u.%02u"
 
-#~ msgid "_No"
-#~ msgstr "_No"
+#: ../src/empathy-ft-manager.c:178
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Unknown"
 
-#~ msgid "_Search..."
-#~ msgstr "_Search..."
+#: ../src/empathy-ft-manager.c:273
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s of %s at %s/s"
 
-#~ msgid "_Yes"
-#~ msgstr "_Yes"
+#: ../src/empathy-ft-manager.c:274
+#, c-format
+msgid "%s of %s"
+msgstr "%s of %s"
 
-#~ msgid "Be silent when away"
-#~ msgstr "Be silent when away"
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:305
+#, c-format
+msgid "Receiving \"%s\" from %s"
+msgstr "Receiving \"%s\" from %s"
 
-#~ msgid "Be silent when busy"
-#~ msgstr "Be silent when busy"
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:308
+#, c-format
+msgid "Sending \"%s\" to %s"
+msgstr "Sending \"%s\" to %s"
 
-#~ msgid "Height of main window"
-#~ msgstr "Height of main window"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:338
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Error receiving \"%s\" from %s"
 
-#~ msgid "The X position of the main window."
-#~ msgstr "The X position of the main window."
+#: ../src/empathy-ft-manager.c:341
+msgid "Error receiving a file"
+msgstr "Error receiving a file"
 
-#~ msgid "The Y position of the main window."
-#~ msgstr "The Y position of the main window."
+#: ../src/empathy-ft-manager.c:346
+#, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr "Error sending \"%s\" to %s"
 
-#~ msgid "The width of the main window."
-#~ msgstr "The width of the main window."
+#: ../src/empathy-ft-manager.c:349
+msgid "Error sending a file"
+msgstr "Error sending a file"
 
-#~ msgid "Whether spell checking should be turned on."
-#~ msgstr "Whether spell checking should be enabled."
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:488
+#, c-format
+msgid "\"%s\" received from %s"
+msgstr "\"%s\" received from %s"
 
-#~ msgid "Width of the main window"
-#~ msgstr "Width of the main window"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:493
+#, c-format
+msgid "\"%s\" sent to %s"
+msgstr "\"%s\" sent to %s"
 
-#~ msgid "X position of main window"
-#~ msgstr "X position of main window"
+#: ../src/empathy-ft-manager.c:496
+msgid "File transfer completed"
+msgstr "File transfer completed"
 
-#~ msgid "Y position of main window"
-#~ msgstr "Y position of main window"
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+msgid "Waiting for the other participant's response"
+msgstr "Waiting for the other participant's response"
 
-#~ msgid "Gossip, Instant Messaging Client"
-#~ msgstr "Gossip, Instant Messaging Client"
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#, c-format
+msgid "Checking integrity of \"%s\""
+msgstr "Checking integrity of \"%s\""
 
-#, fuzzy
-#~ msgid "Close this chat window"
-#~ msgstr "_Invite to Chat Room"
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#, c-format
+msgid "Hashing \"%s\""
+msgstr "Hashing \"%s\""
 
-#~ msgid "Requested Information"
-#~ msgstr "Requested Information"
+#: ../src/empathy-ft-manager.c:1025
+msgid "%"
+msgstr "%"
 
-#~ msgid "/_Invite to Chat Conference"
-#~ msgstr "/_Invite to Chat Conference"
+#: ../src/empathy-ft-manager.c:1037
+msgid "File"
+msgstr "File"
 
-#, fuzzy
-#~ msgid "Send Message"
-#~ msgstr "_New Message..."
+#: ../src/empathy-ft-manager.c:1059
+msgid "Remaining"
+msgstr "Remaining"
 
-#, fuzzy
-#~ msgid "%s has gone offline"
-#~ msgstr "%s went offline"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+msgstr "File Transfers"
 
-#~ msgid "Contact _Information"
-#~ msgstr "Contact _Information"
+#: ../src/empathy-ft-manager.ui.h:2
+msgid "Remove completed, canceled and failed file transfers from the list"
+msgstr "Remove completed, cancellled and failed file transfers from the list"
 
-#~ msgid "<b>Sound</b>"
-#~ msgstr "<b>Sound</b>"
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
 
-#~ msgid "Check spelling while I _type"
-#~ msgstr "Check spelling while I _type"
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "Import Accounts"
 
-#~ msgid "Gossip - Accounts"
-#~ msgstr "Gossip - Accounts"
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:315
+msgid "Import"
+msgstr "Import"
 
-#, fuzzy
-#~ msgid "Join _Group Chat..."
-#~ msgstr "_Join Group Chat..."
+#: ../src/empathy-import-widget.c:324
+msgid "Protocol"
+msgstr "Protocol"
 
-#~ msgid "Por_t:"
-#~ msgstr "Por_t:"
+#: ../src/empathy-import-widget.c:348
+msgid "Source"
+msgstr "Source"
 
-#~ msgid "Requested information."
-#~ msgstr "Requested information."
+#: ../src/empathy-roster-window.c:389
+msgid "Provide Password"
+msgstr "Provide Password"
 
-#~ msgid "Requesting contact information, please wait..."
-#~ msgstr "Requesting contact information, please wait..."
+#: ../src/empathy-roster-window.c:395
+msgid "Disconnect"
+msgstr "Disconnect"
 
-#~ msgid "Could not open connection"
-#~ msgstr "Could not open connection"
+#: ../src/empathy-roster-window.c:644
+msgid "You need to setup an account to see contacts here."
+msgstr "You need to setup an account to see contacts here."
 
-#~ msgid "Could not find the server you wanted to use"
-#~ msgstr "Could not find the server you wanted to use"
+#: ../src/empathy-roster-window.c:660
+msgid "No match found"
+msgstr "No match found"
 
-#~ msgid "Connection to the server failed."
-#~ msgstr "Connection to the server failed."
+#: ../src/empathy-roster-window.c:765
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "Sorry, %s accounts can’t be used until your %s software is updated."
 
-#~ msgid "Authentication failed"
-#~ msgstr "Authentication failed"
+#: ../src/empathy-roster-window.c:831
+msgid "Update software..."
+msgstr "Update software..."
 
-#~ msgid "Written by:"
-#~ msgstr "Written by:"
+#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
+msgid "Close"
+msgstr "Close"
 
-#~ msgid "Artwork by:"
-#~ msgstr "Artwork by:"
+#: ../src/empathy-roster-window.c:942
+msgid "Reconnect"
+msgstr "Reconnect"
 
-#~ msgid "Translated by:"
-#~ msgstr "Translated by:"
+#: ../src/empathy-roster-window.c:948
+msgid "Edit Account"
+msgstr "Edit Account"
 
-#~ msgid "Account ID"
-#~ msgstr "Account ID"
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1092
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Top up %s (%s)..."
 
-#~ msgid "Last Error"
-#~ msgstr "Last Error"
+#: ../src/empathy-roster-window.c:1138
+msgid "Top up account credit"
+msgstr "Top up account credit"
 
-#~ msgid "%sChat - %s"
-#~ msgstr "%sChat - %s"
+#. top up button
+#: ../src/empathy-roster-window.c:1210
+msgid "Top Up..."
+msgstr "Top Up..."
 
-#~ msgid "/Show _Log"
-#~ msgstr "/Show _Log"
+#: ../src/empathy-roster-window.c:1933
+msgid "Contact"
+msgstr "Contact"
 
-#~ msgid "Afrikaans"
-#~ msgstr "Afrikaans"
+#: ../src/empathy-roster-window.c:2131
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "You need to enable one of your accounts to see contacts here."
 
-#~ msgid "Amharic"
-#~ msgstr "Amharic"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2139
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "You need to enable %s to see contacts here."
 
-#~ msgid "Arabic"
-#~ msgstr "Arabic"
+#: ../src/empathy-roster-window.c:2419
+msgid "Contact List"
+msgstr "Contact List"
 
-#~ msgid "Azerbaijani"
-#~ msgstr "Azerbaijani"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Account settings"
 
-#~ msgid "Belarusian"
-#~ msgstr "Belarusian"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_New Conversation…"
 
-#~ msgid "Bulgarian"
-#~ msgstr "Bulgarian"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "New _Call…"
 
-#~ msgid "Bengali"
-#~ msgstr "Bengali"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Search for Contacts…"
 
-#~ msgid "Breton"
-#~ msgstr "Breton"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_File Transfers"
 
-#~ msgid "Bosnian"
-#~ msgstr "Bosnian"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Offline Contacts"
 
-#~ msgid "Catalan"
-#~ msgstr "Catalan"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Show P_rotocols"
 
-#~ msgid "Czech"
-#~ msgstr "Czech"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Credit Balance"
 
-#~ msgid "Welsh"
-#~ msgstr "Welsh"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Contacts on a _Map"
 
-#~ msgid "Danish"
-#~ msgstr "Danish"
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Accounts"
 
-#~ msgid "German"
-#~ msgstr "German"
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Blocked Contacts"
 
-#~ msgid "German (Austria)"
-#~ msgstr "German (Austria)"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "P_references"
 
-#~ msgid "German (Germany)"
-#~ msgstr "German (Germany)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Find in Contact _List"
 
-#~ msgid "German (Swiss)"
-#~ msgstr "German (Swiss)"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "Sort by _Name"
 
-#~ msgid "Greek"
-#~ msgstr "Greek"
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "Sort by _Status"
 
-#~ msgid "English"
-#~ msgstr "English"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normal Size With _Avatars"
 
-#~ msgid "English (Canadian)"
-#~ msgstr "English (Canadian)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormal Size"
 
-#~ msgid "English (British)"
-#~ msgstr "English (British)"
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "_Compact Size"
 
-#~ msgid "English (American)"
-#~ msgstr "English (American)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Room"
 
-#~ msgid "Esperanto"
-#~ msgstr "Esperanto"
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Join…"
+msgstr "_Join…"
 
-#~ msgid "Spanish"
-#~ msgstr "Spanish"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Join _Favourites"
 
-#~ msgid "Estonian"
-#~ msgstr "Estonian"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Manage Favourites"
 
-#~ msgid "Persian"
-#~ msgstr "Persian"
+#: ../src/empathy-new-chatroom-dialog.c:369
+msgid "Chat Room"
+msgstr "Chat Room"
 
-#~ msgid "Finnish"
-#~ msgstr "Finnish"
+#: ../src/empathy-new-chatroom-dialog.c:385
+msgid "Members"
+msgstr "Members"
 
-#~ msgid "French"
-#~ msgstr "French"
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:637
+#, c-format
+msgid ""
+"%s\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"%s\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
 
-#~ msgid "French (France)"
-#~ msgstr "French (France)"
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "No"
+msgstr "No"
 
-#~ msgid "French (Swiss)"
-#~ msgstr "French (Swiss)"
+#: ../src/empathy-new-chatroom-dialog.c:668
+msgid "Could not start room listing"
+msgstr "Could not start room listing"
 
-#~ msgid "Irish Gaelic"
-#~ msgstr "Irish Gaelic"
+#: ../src/empathy-new-chatroom-dialog.c:678
+msgid "Could not stop room listing"
+msgstr "Could not stop room listing"
 
-#~ msgid "Scots Gaelic"
-#~ msgstr "Scots Gaelic"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Join Room"
 
-#~ msgid "Gujarati"
-#~ msgstr "Gujarati"
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+"Enter the room name to join here or click on one or more rooms in the list."
 
-#~ msgid "Manx Gaelic"
-#~ msgstr "Manx Gaelic"
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Room:"
 
-#~ msgid "Hebrew"
-#~ msgstr "Hebrew"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
 
-#~ msgid "Hindi"
-#~ msgstr "Hindi"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Couldn't load room list"
 
-#~ msgid "Croatian"
-#~ msgstr "Croatian"
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
+msgid "Room List"
+msgstr "Room List"
 
-#~ msgid "Hungarian"
-#~ msgstr "Hungarian"
+#: ../src/empathy-preferences.c:166
+msgid "Message received"
+msgstr "Message received"
 
-#~ msgid "Indonesian"
-#~ msgstr "Indonesian"
+#: ../src/empathy-preferences.c:167
+msgid "Message sent"
+msgstr "Message sent"
 
-#~ msgid "Icelandic"
-#~ msgstr "Icelandic"
+#: ../src/empathy-preferences.c:168
+msgid "New conversation"
+msgstr "New conversation"
 
-#~ msgid "Italian"
-#~ msgstr "Italian"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Contact comes online"
 
-#~ msgid "Japanese"
-#~ msgstr "Japanese"
+#: ../src/empathy-preferences.c:170
+msgid "Contact goes offline"
+msgstr "Contact goes offline"
 
-#~ msgid "Georgian"
-#~ msgstr "Georgian"
+#: ../src/empathy-preferences.c:171
+msgid "Account connected"
+msgstr "Account connected"
 
-#~ msgid "Kannada"
-#~ msgstr "Kannada"
+#: ../src/empathy-preferences.c:172
+msgid "Account disconnected"
+msgstr "Account disconnected"
 
-#~ msgid "Korean"
-#~ msgstr "Korean"
+#: ../src/empathy-preferences.c:475
+msgid "Language"
+msgstr "Language"
 
-#~ msgid "Kurdish"
-#~ msgstr "Kurdish"
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:726
+msgid "Juliet"
+msgstr "Juliet"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:733
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:739
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:743
+msgid "Deny thy father and refuse thy name;"
+msgstr "Deny thy father and refuse thy name;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:746
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Or if thou wilt not, be but sworn my love"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:749
+msgid "And I'll no longer be a Capulet."
+msgstr "And I'll no longer be a Capulet."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:752
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Shall I hear more, or shall I speak at this?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:755
+msgid "Juliet has disconnected"
+msgstr "Juliet has disconnected"
+
+#: ../src/empathy-preferences.c:1159
+msgid "Preferences"
+msgstr "Preferences"
 
-#~ msgid "Cornish"
-#~ msgstr "Cornish"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Show _smileys as images"
 
-#~ msgid "Limburgish"
-#~ msgstr "Limburgish"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Show contact _list in rooms"
 
-#~ msgid "Lithuanian"
-#~ msgstr "Lithuanian"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Appearance"
+msgstr "Appearance"
 
-#~ msgid "Latvian"
-#~ msgstr "Latvian"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Start chats in:"
 
-#~ msgid "Maori"
-#~ msgstr "Maori"
+#: ../src/empathy-preferences.ui.h:5
+msgid "new ta_bs"
+msgstr "new ta_bs"
 
-#~ msgid "Macedonian"
-#~ msgstr "Macedonian"
+#: ../src/empathy-preferences.ui.h:6
+msgid "new _windows"
+msgstr "new _windows"
 
-#~ msgid "Malayalam"
-#~ msgstr "Malayalam"
+#: ../src/empathy-preferences.ui.h:7
+msgid "Display incoming events in the notification area"
+msgstr "Display incoming events in the notification area"
 
-#~ msgid "Mongolian"
-#~ msgstr "Mongolian"
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Automatically connect on startup"
 
-#~ msgid "Marathi"
-#~ msgstr "Marathi"
+#: ../src/empathy-preferences.ui.h:9
+msgid "Log conversations"
+msgstr "Log conversations"
 
-#~ msgid "Malay"
-#~ msgstr "Malay"
+#: ../src/empathy-preferences.ui.h:10
+msgid "Behavior"
+msgstr "Behaviour"
 
-#~ msgid "Norwegian (Bokmal)"
-#~ msgstr "Norwegian (Bokmal)"
+#: ../src/empathy-preferences.ui.h:11
+msgid "General"
+msgstr "General"
 
-#~ msgid "Nepali"
-#~ msgstr "Nepali"
+#: ../src/empathy-preferences.ui.h:12
+msgid "_Enable bubble notifications"
+msgstr "_Enable bubble notifications"
 
-#~ msgid "Dutch"
-#~ msgstr "Dutch"
+#: ../src/empathy-preferences.ui.h:13
+msgid "Disable notifications when _away or busy"
+msgstr "Disable notifications when _away or busy"
 
-#~ msgid "Norwegian"
-#~ msgstr "Norwegian"
+#: ../src/empathy-preferences.ui.h:14
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Enable notifications when the _chat is not focused"
 
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "Norwegian (Nynorsk)"
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Enable notifications when a contact comes online"
 
-#~ msgid "Norwegian (Nyorsk)"
-#~ msgstr "Norwegian (Nyorsk)"
+#: ../src/empathy-preferences.ui.h:16
+msgid "Enable notifications when a contact goes offline"
+msgstr "Enable notifications when a contact goes offline"
 
-#~ msgid "Oriya"
-#~ msgstr "Oriya"
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Notifications"
 
-#~ msgid "Punjabi"
-#~ msgstr "Punjabi"
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Enable sound notifications"
 
-#~ msgid "Polish"
-#~ msgstr "Polish"
+#: ../src/empathy-preferences.ui.h:19
+msgid "Disable sounds when _away or busy"
+msgstr "Disable sounds when _away or busy"
 
-#~ msgid "Portuguese"
-#~ msgstr "Portuguese"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Play sound for events"
+msgstr "Play sound for events"
 
-#~ msgid "Portuguese (Portugal)"
-#~ msgstr "Portuguese (Portugal)"
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Sounds"
 
-#~ msgid "Portuguese (Brazil)"
-#~ msgstr "Portuguese (Brazil)"
+#: ../src/empathy-preferences.ui.h:22
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Use _echo cancellllation to improve call quality"
 
-#~ msgid "Romanian"
-#~ msgstr "Romanian"
+#: ../src/empathy-preferences.ui.h:23
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Echo cancellllation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo "
+"cancellllation off and restarting the call."
 
-#~ msgid "Russian"
-#~ msgstr "Russian"
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Publish location to my contacts"
 
-#~ msgid "Kinyarwanda"
-#~ msgstr "Kinyarwanda"
+#: ../src/empathy-preferences.ui.h:27
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 
-#~ msgid "Slovak"
-#~ msgstr "Slovak"
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Reduce location accuracy"
+msgstr "_Reduce location accuracy"
 
-#~ msgid "Slovenian"
-#~ msgstr "Slovenian"
+#: ../src/empathy-preferences.ui.h:30
+msgid "Privacy"
+msgstr "Privacy"
 
-#~ msgid "Albanian"
-#~ msgstr "Albanian"
+#: ../src/empathy-preferences.ui.h:31
+msgid "_GPS"
+msgstr "_GPS"
 
-#~ msgid "Serbian"
-#~ msgstr "Serbian"
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Cellphone"
+msgstr "_Cellphone"
 
-#~ msgid "Swedish"
-#~ msgstr "Swedish"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Network (IP, Wi-Fi)"
 
-#~ msgid "Tamil"
-#~ msgstr "Tamil"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Location sources:"
 
-#~ msgid "Telugu"
-#~ msgstr "Telugu"
+#: ../src/empathy-preferences.ui.h:36
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
 
-#~ msgid "Thai"
-#~ msgstr "Thai"
+#: ../src/empathy-preferences.ui.h:37
+msgid "Enable spell checking for languages:"
+msgstr "Enable spell checking for languages:"
 
-#~ msgid "Turkmen"
-#~ msgstr "Turkmen"
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Spell Checking"
 
-#~ msgid "Turkish"
-#~ msgstr "Turkish"
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "Chat Th_eme:"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrainian"
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variant:"
 
-#~ msgid "Vietnamese"
-#~ msgstr "Vietnamese"
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Themes"
 
-#~ msgid "Wallon"
-#~ msgstr "Wallon"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "Status"
 
-#~ msgid "Xhosa"
-#~ msgstr "Xhosa"
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "_Quit"
 
-#~ msgid "Yiddish"
-#~ msgstr "Yiddish"
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Redial"
+msgstr "Redial"
 
-#~ msgid "Chinese Simplified"
-#~ msgstr "Chinese Simplified"
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "V_ideo"
+msgstr "V_ideo"
 
-#~ msgid "Chinese Traditional"
-#~ msgstr "Chinese Traditional"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video Off"
 
-#~ msgid "View Lo_g"
-#~ msgstr "View Lo_g"
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Video Preview"
+msgstr "Video Preview"
 
-#, fuzzy
-#~ msgid "Gossip - Chat Rooms"
-#~ msgstr "Gossip - Edit Chat Room"
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Video On"
+msgstr "Video On"
 
-#~ msgid "Gossip - Group Chat"
-#~ msgstr "Gossip - Group Chat"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Call the contact again"
 
-#, fuzzy
-#~ msgid "Gossip - New Chatroom"
-#~ msgstr "Gossip - Edit Chat Room"
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Camera Off"
+msgstr "Camera Off"
 
-#~ msgid "Gossip - Add contact"
-#~ msgstr "Gossip - Add contact"
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Disable camera and stop sending video"
+msgstr "Disable camera and stop sending video"
 
-#~ msgid "Gossip - Contact Information"
-#~ msgstr "Gossip - Contact Information"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Preview"
 
-#~ msgid "Gossip - Edit Groups"
-#~ msgstr "Gossip - Edit Groups"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Enable camera but don't send video"
 
-#~ msgid "Gossip - New Account"
-#~ msgstr "Gossip - New Account"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Camera On"
 
-#~ msgid "Gossip - New Message"
-#~ msgstr "Gossip - New Message"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Enable camera and send video"
 
-#~ msgid "Gossip - Personal Details"
-#~ msgstr "Gossip - Personal Details"
+#: ../src/empathy-map-view.c:471
+msgid "Contact Map View"
+msgstr "Contact Map View"
 
-#~ msgid "Gossip - Preferences"
-#~ msgstr "Gossip - Preferences"
+#: ../src/empathy-debug-window.c:1228
+msgid "Save"
+msgstr "Save"
 
-#~ msgid "Gossip - Spell Checker"
-#~ msgstr "Gossip - Spell Checker"
+#: ../src/empathy-debug-window.c:1435
+msgid "Debug Window"
+msgstr "Debug Window"
 
-#~ msgid "Gossip - Status Message"
-#~ msgstr "Gossip - Status Message"
+#: ../src/empathy-debug-window.c:1517
+msgid "Pause"
+msgstr "Pause"
 
-#~ msgid "Waiting for server to respond, please wait..."
-#~ msgstr "Waiting for server to respond; please wait..."
+#: ../src/empathy-debug-window.c:1529
+msgid "Level "
+msgstr "Level "
 
-#~ msgid "Connection could not be created"
-#~ msgstr "Connection could not be created"
+#: ../src/empathy-debug-window.c:1549
+msgid "Debug"
+msgstr "Debug"
 
-#~ msgid "Redirect"
-#~ msgstr "Redirect"
+#: ../src/empathy-debug-window.c:1555
+msgid "Info"
+msgstr "Info"
 
-#~ msgid "Bad Request"
-#~ msgstr "Bad Request"
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+msgid "Message"
+msgstr "Message"
 
-#~ msgid "Not Authorized"
-#~ msgstr "Not Authorized"
+#: ../src/empathy-debug-window.c:1567
+msgid "Warning"
+msgstr "Warning"
 
-#~ msgid "Payment Required"
-#~ msgstr "Payment Required"
+#: ../src/empathy-debug-window.c:1573
+msgid "Critical"
+msgstr "Critical"
 
-#~ msgid "Forbidden"
-#~ msgstr "Forbidden"
+#: ../src/empathy-debug-window.c:1579
+msgid "Error"
+msgstr "Error"
 
-#~ msgid "Not Found"
-#~ msgstr "Not Found"
+#: ../src/empathy-debug-window.c:1598
+msgid "Time"
+msgstr "Time"
 
-#~ msgid "Not Allowed"
-#~ msgstr "Not Allowed"
+#: ../src/empathy-debug-window.c:1601
+msgid "Domain"
+msgstr "Domain"
 
-#~ msgid "Not Acceptable"
-#~ msgstr "Not Acceptable"
+#: ../src/empathy-debug-window.c:1603
+msgid "Category"
+msgstr "Category"
 
-#~ msgid "Request Timeout"
-#~ msgstr "Request Timeout"
+#: ../src/empathy-debug-window.c:1605
+msgid "Level"
+msgstr "Level"
 
-#~ msgid "Conflict"
-#~ msgstr "Conflict"
+#: ../src/empathy-debug-window.c:1642
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"The selected connection manager does not support the remote debugging "
+"extension."
 
-#~ msgid "Not Implemented"
-#~ msgstr "Not Implemented"
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
+msgid "Invite Participant"
+msgstr "Invite Participant"
 
-#~ msgid "Remote Server Error"
-#~ msgstr "Remote Server Error"
+#: ../src/empathy-invite-participant-dialog.c:201
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Choose a contact to invite into the conversation:"
 
-#~ msgid "Unknown error."
-#~ msgstr "Unknown error."
+#: ../src/empathy-invite-participant-dialog.c:224
+msgid "Invite"
+msgstr "Invite"
 
-#~ msgid "Custom"
-#~ msgstr "Custom"
+#: ../src/empathy-accounts.c:183
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "Don't display any dialogs; do any work (eg, importing) and exit"
 
-#~ msgid "The chat room you are trying is not responding."
-#~ msgstr "The chat room you are trying is not responding."
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
 
-#~ msgid "Check your details and try again."
-#~ msgstr "Check your details and try again."
+#: ../src/empathy-accounts.c:191
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:193
+msgid "<account-id>"
+msgstr "<account-id>"
+
+#: ../src/empathy-accounts.c:196
+msgid "Show account assistant"
+msgstr "Show account assistant"
+
+#: ../src/empathy-accounts.c:202
+msgid "- Empathy Accounts"
+msgstr "- Empathy Accounts"
+
+#: ../src/empathy-accounts.c:238
+msgid "Empathy Accounts"
+msgstr "Empathy Accounts"
+
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "Show a particular service"
+
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Empathy Debugger"
+
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "Empathy Debugger"
+
+#: ../src/empathy-chat.c:107
+msgid "- Empathy Chat Client"
+msgstr "- Empathy Chat Client"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Respond"
+msgstr "Respond"
+
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1565
+msgid "Reject"
+msgstr "Reject"
+
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1566
+msgid "Answer"
+msgstr "Answer"
+
+#: ../src/empathy-notifications-approver.c:214
+msgid "Answer with video"
+msgstr "Answer with video"
+
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
+msgid "Decline"
+msgstr "Decline"
+
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
+msgid "Accept"
+msgstr "Accept"
+
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:247
+msgid "Provide"
+msgstr "Provide"
+
+#: ../src/empathy-call-observer.c:134
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s just tried to call you, but you were in another call."
 
-#~ msgid "This is currently unsupported."
-#~ msgstr "This is currently unsupported."
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+msgid "i"
+msgstr "i"
 
-#~ msgid "Perhaps the conference server is busy, try again later."
-#~ msgstr "Perhaps the conference server is busy; try again later."
+#: ../src/empathy-call-window.c:2929
+msgid "On hold"
+msgstr "On hold"
 
-#~ msgid "Check the server host name is correct and is available."
-#~ msgstr "Check the server host name is correct and is available."
+#: ../src/empathy-call-window.c:2932
+msgid "Mute"
+msgstr "Mute"
 
-#~ msgid "Gossip will now try to use your account:"
-#~ msgstr "Gossip will now try to use your account:"
+#: ../src/empathy-call-window.c:2934
+msgid "Duration"
+msgstr "Duration"
 
-#~ msgid "Gossip will now try to register the account:"
-#~ msgstr "Gossip will now try to register the account:"
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2937
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
 
-#~ msgid "Cus_tomize"
-#~ msgstr "Cus_tomize"
+#: ../src/empathy-call-window.c:3207
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Your current balance is %s."
 
-#~ msgid "Edit or Delete this favorite."
-#~ msgstr "Edit or Delete this favourite."
+#: ../src/empathy-call-window.c:3211
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Sorry, you don’t have enough credit for that call."
 
-#~ msgid "Gossip - Join Chat Room "
-#~ msgstr "Gossip - Join Chat Room "
+#: ../src/empathy-call-window.c:3213
+msgid "Top Up"
+msgstr "Top Up"
 
-#~ msgid "Choose a Server"
-#~ msgstr "Choose a Server"
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Match case"
 
-#~ msgid "On what server do you have an account?"
-#~ msgstr "On what server do you have an account?"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Adding new account"
diff --git a/po/es.po b/po/es.po
index 86072fa66..92bc180ff 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,15 +2,15 @@
 # Copyright (C) 2003 Free Software Foundation
 # This file is distributed under the same license as the Gossip package.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-12-22 11:35+0000\n"
-"PO-Revision-Date: 2011-12-23 14:51+0100\n"
+"POT-Creation-Date: 2012-02-16 20:30+0000\n"
+"PO-Revision-Date: 2012-02-17 10:29+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,519 +20,539 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Chatee en Google Talk, Facebook, MSN y muchos otros servicios de chat"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Cliente de mensajería instantánea"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Mensajería instantánea Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Cliente de mensajería instantánea"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chatee en Google Talk, Facebook, MSN y muchos otros servicios de chat"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "Cuentas de mensajería y Voz IP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Gestionar las cuentas de mensajería y Voz IP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Siempre abrir una ventana de chat separada para chats nuevos."
+msgid "Connection managers should be used"
+msgstr "Se deberían usar gestores de conexión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Dispositivo de cámara"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Indica si se debe usan usar gestores de conectividad para desconectarse/"
+"reconectarse automáticamente."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Posición de la cámara"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy se debería autoconectar al inicio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
-"Carácter que añadir después del apodo cuando se usa el completado de apodos "
-"(tab) en salas de chat."
+"Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al "
+"inicio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Tema de la ventana de charla"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy debería mostrar ausencia en inactividad"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Variante del tema de la ventana de charla"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Lista separada por comas de idiomas que se usarán en la revisión ortográfica "
-"(ej. «es, en, fr»)."
+"Indica si Empathy debe entrar en modo de ausencia automáticamente si el "
+"usuario está inactivo."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Empathy default download folder"
+msgstr "Carpeta de descargas predeterminada de Epiphany"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Lista compacta de contactos"
+msgid "The default folder to save file transfers in."
+msgstr "La carpeta predeterminada donde guardar los archivos transferidos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Se deberían usar gestores de conexión"
+msgid "Show offline contacts"
+msgstr "Mostrar contactos no conectados"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Criterio de ordenación de la lista de contactos"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr ""
+"Indica si se debe mostrar los contactos que están desconectados en la lista "
+"de contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
-"Ruta del objeto D-Bus de la última cuenta seleccionada para unirse a una "
-"sala."
+msgid "Show avatars"
+msgstr "Mostrar avatares"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
-"El dispositivo de cámara predeterminado que usar en las llamadas de vídeo, "
-"ej. /dev/video0."
+"Indica si se deben mostrar los avatares para los contactos en la lista de "
+"contactos y ventanas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Carpeta predeterminada para seleccionar un avatar"
+msgid "Show protocols"
+msgstr "Mostrar protocolos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Desactivar las notificaciones emergentes al estar ausente"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Indica si se deben mostrar los protocolos para los contactos en la lista de "
+"contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Desactivar los sonidos al ausentarse"
+msgid "Show Balance in contact list"
+msgstr "Mostrar crédito en la lista de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Mostrar los eventos entrantes en el área de estado"
+msgid "Whether to show account balances in the contact list."
+msgstr "Indica si se debe mostrar el crédito en la lista de contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Mostrar los eventos entrantes en el área de estado. Si es falso presentarlos "
-"directamente al usuario."
+msgid "Compact contact list"
+msgstr "Lista compacta de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Soporte de cancelación de eco"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Indica si se debe mostrar la lista de contactos en modo compacto."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy puede publicar la ubicación del usuario"
+msgid "Hide main window"
+msgstr "Ocultar la ventana principal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy puede usar el GPS para deducir la ubicación"
+msgid "Hide the main window."
+msgstr "Ocultar la ventana principal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy puede usar la red telefónica móvil para deducir la ubicación"
+msgid "Default directory to select an avatar image from"
+msgstr "Carpeta predeterminada para seleccionar un avatar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy puede usar la red para deducir la ubicación"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Última carpeta de la que se eligió un avatar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Carpeta de descargas predeterminada de Epiphany"
+msgid "Open new chats in separate windows"
+msgstr "Abrir chats nuevos en ventanas separadas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy debería mostrar ausencia en inactividad"
+msgid "Always open a separate chat window for new chats."
+msgstr "Siempre abrir una ventana de chat separada para chats nuevos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy se debería autoconectar al inicio"
+msgid "Display incoming events in the status area"
+msgstr "Mostrar los eventos entrantes en el área de estado"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy debería reducir la precisión de la ubicación"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Mostrar los eventos entrantes en el área de estado. Si es falso presentarlos "
+"directamente al usuario."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empathy debería usar el avatar del contacto como icono de la ventana de chat"
+msgid "The position for the chat window side pane"
+msgstr "La posición para el panel lateral de la ventana de charla"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Activar las herramientas de desarrollo de WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+"La posición almacenada (en píxeles) del panel lateral de la ventana de "
+"charla."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Activar notificaciones emergentes para mensajes nuevos"
+msgid "Show contact groups"
+msgstr "Mostrar grupos de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Activar revisor ortográfico"
+msgid "Whether to show groups in the contact list."
+msgstr "Indica si se deben mostrar los grupos en la lista de contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Ocultar la ventana principal"
+msgid "Contact list sort criterion"
+msgstr "Criterio de ordenación de la lista de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Ocultar la ventana principal."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Qué criterio usar al ordenar la lista de contactos. El predeterminado es "
+"ordenar por el estado del contacto con el valor «state» (estado). Un valor "
+"«nombre» (nombre) ordenará la lista por el nombre."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "Última cuenta seleccionada en el diálogo Unirse a sala"
+msgid "Use notification sounds"
+msgstr "Usar sonidos de notificación"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Carácter de completado de apodo"
+msgid "Whether to play a sound to notify of events."
+msgstr "Indica si se debe reproducir un sonido para notificar eventos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Abrir chats nuevos en ventanas separadas"
+msgid "Disable sounds when away"
+msgstr "Desactivar los sonidos al ausentarse"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Ruta del tema Adium que usar"
+msgid "Whether to play sound notifications when away or busy."
+msgstr ""
+"Indica si se deben reproducir sonidos de notificaciones cuando se esté "
+"ausente u ocupado."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Ruta al tema Adium que usar si el tema usado para el chat es Adium."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "Reproducir un sonido cuando lleguen mensajes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Reproducir un sonido para conversaciones nuevas"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar mensajes entrantes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for outgoing messages"
 msgstr "Reproducir un sonido al enviar mensajes"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar mensajes salientes."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Reproducir un sonido cuando un contacto inicie sesión"
+msgid "Play a sound for new conversations"
+msgstr "Reproducir un sonido para conversaciones nuevas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Reproducir un sonido cuando un contacto finalice su sesión"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar conversaciones nuevas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Reproducir un sonido cuando inicio sesión"
+msgid "Play a sound when a contact logs in"
+msgstr "Reproducir un sonido cuando un contacto inicie sesión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Reproducir un sonido al finalizar una sesión"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar los inicios de sesión "
+"de los contactos en la red."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr ""
-"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
+msgid "Play a sound when a contact logs out"
+msgstr "Reproducir un sonido cuando un contacto finalice su sesión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar las finalizaciones de "
+"sesión de los contactos en la red."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta"
+msgid "Play a sound when we log in"
+msgstr "Reproducir un sonido cuando inicio sesión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Posición donde estar la vista previa de la cámara durante una llamada."
+msgid "Whether to play a sound when logging into a network."
+msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Mostrar crédito en la lista de contactos"
+msgid "Play a sound when we log out"
+msgstr "Reproducir un sonido al finalizar una sesión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Mostrar avatares"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Mostrar lista de contactos en salas"
+msgid "Enable popup notifications for new messages"
+msgstr "Activar notificaciones emergentes para mensajes nuevos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Mostrar consejo sobre cómo cerrar la ventana principal"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+"Indica si se deben mostrar notificaciones emergentes al recibir un mensaje "
+"nuevo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Mostrar contactos no conectados"
+msgid "Disable popup notifications when away"
+msgstr "Desactivar las notificaciones emergentes al estar ausente"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Mostrar protocolos"
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Indica si se deben mostrar las notificaciones emergentes cuando se esté "
+"ausente u ocupado."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Idiomas para revisión ortográfica"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr ""
+"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "La carpeta predeterminada donde guardar los archivos transferidos."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Indica si de deben mostrar notificaciones emergentes al recibir un mensaje "
+"nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Última carpeta de la que se eligió un avatar."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "La posición para el panel lateral de la ventana de charla"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
+"se conecta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
-"La posición almacenada (en píxeles) del panel lateral de la ventana de "
-"charla."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
-"El tema que se usará para mostrar la conversación en las ventanas de chat."
+"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
+"se desconecta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"La variante del tema que se usará para mostrar la conversación en las "
-"ventanas de chat."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "Usar emoticonos gráficos"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr ""
+"Indica si se deben convertir los emoticonos en imágenes gráficas en las "
+"conversaciones."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "Usar sonidos de notificación"
+msgid "Show contact list in rooms"
+msgstr "Mostrar lista de contactos en salas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Usar tema para salas de chat"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Indica si se debe mostrar la lista de contactos en salas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Indica si Empathy puede publicar la ubicación del usuario a sus contactos."
+msgid "Chat window theme"
+msgstr "Tema de la ventana de charla"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr ""
+"El tema que se usará para mostrar la conversación en las ventanas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Indica si Empathy puede usar la red telefónica móvil para deducir la "
-"ubicación."
+msgid "Chat window theme variant"
+msgstr "Variante del tema de la ventana de charla"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Indica si Empathy puede usar la red para deducir la ubicación."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"La variante del tema que se usará para mostrar la conversación en las "
+"ventanas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al "
-"inicio."
+msgid "Path of the Adium theme to use"
+msgstr "Ruta del tema Adium que usar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Indica si Empathy debe entrar en modo de ausencia automáticamente si el "
-"usuario está inactivo."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Ruta al tema Adium que usar si el tema usado para el chat es Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Indica si Empathy debería reducir la precisión de la ubicación por motivos "
-"de privacidad."
+msgid "Enable WebKit Developer Tools"
+msgstr "Activar las herramientas de desarrollo de WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Indica si Empathy debería usar el avatar del contacto como el icono de la "
-"ventana de chat."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Indica si las herramientas de desarrollo de WebKit, tales como el Inspector "
 "web, den activarse."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Inform other users when you are typing to them"
+msgstr "Informar a otros usuarios de cuándo les esta escribiendo"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Indica si se debe usan usar gestores de conectividad para desconectarse/"
-"reconectarse automáticamente."
+"Indica si enviar los estados de chat «escribiendo» o «en pausa». No afecta al "
+"estado «ausente»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Indica si se deben revisar las palabras tecleadas con respecto a los idiomas "
-"con los que quiere comprobarlo."
+msgid "Use theme for chat rooms"
+msgstr "Usar tema para salas de chat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr ""
-"Indica si se deben convertir los emoticonos en imágenes gráficas en las "
-"conversaciones."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Indica si se debe usar el tema para salas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr ""
-"Indica si se debe activar la el filtro de cancelación de eco de Pulseaudio."
+msgid "Spell checking languages"
+msgstr "Idiomas para revisión ortográfica"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Indica si se debe reproducir un sonido para notificar los inicios de sesión "
-"de los contactos en la red."
+"Lista separada por comas de idiomas que se usarán en la revisión ortográfica "
+"(ej. «es, en, fr»)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Indica si se debe reproducir un sonido para notificar las finalizaciones de "
-"sesión de los contactos en la red."
+msgid "Enable spell checker"
+msgstr "Activar revisor ortográfico"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Indica si se debe reproducir un sonido para notificar eventos."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Indica si se deben revisar las palabras tecleadas con respecto a los idiomas "
+"con los que quiere comprobarlo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr ""
-"Indica si se debe reproducir un sonido para notificar mensajes entrantes."
+msgid "Nick completed character"
+msgstr "Carácter de completado de apodo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
-"Indica si se debe reproducir un sonido para notificar conversaciones nuevas."
+"Carácter que añadir después del apodo cuando se usa el completado de apodos "
+"(tab) en salas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
-"Indica si se debe reproducir un sonido para notificar mensajes salientes."
+"Empathy debería usar el avatar del contacto como icono de la ventana de chat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Indica si Empathy debería usar el avatar del contacto como el icono de la "
+"ventana de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red."
+msgid "Last account selected in Join Room dialog"
+msgstr "Última cuenta seleccionada en el diálogo Unirse a sala"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
+msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
-"Indica si se deben reproducir sonidos de notificaciones cuando se esté "
-"ausente u ocupado."
+"Ruta del objeto D-Bus de la última cuenta seleccionada para unirse a una "
+"sala."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
-"se desconecta."
+msgid "Camera device"
+msgstr "Dispositivo de cámara"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
-"se conecta."
+"El dispositivo de cámara predeterminado que usar en las llamadas de vídeo, "
+"ej. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Indica si de deben mostrar notificaciones emergentes al recibir un mensaje "
-"nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco."
+msgid "Camera position"
+msgstr "Posición de la cámara"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr ""
-"Indica si se deben mostrar notificaciones emergentes al recibir un mensaje "
-"nuevo."
+msgid "Position the camera preview should be during a call."
+msgstr "Posición donde estar la vista previa de la cámara durante una llamada."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Indica si se debe mostrar el crédito en la lista de contactos."
+msgid "Echo cancellation support"
+msgstr "Soporte de cancelación de eco"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
-"Indica si se deben mostrar los avatares para los contactos en la lista de "
-"contactos y ventanas de chat."
+"Indica si se debe activar la el filtro de cancelación de eco de Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr ""
-"Indica si se debe mostrar los contactos que están desconectados en la lista "
-"de contactos."
+msgid "Show hint about closing the main window"
+msgstr "Mostrar consejo sobre cómo cerrar la ventana principal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Indica si se deben mostrar las notificaciones emergentes cuando se esté "
-"ausente u ocupado."
+"Indica si se debe mostrar un mensaje de diálogo sobre cómo cerrar la ventana "
+"principal con el botón «x» en la barra de título."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Indica si se deben mostrar los protocolos para los contactos en la lista de "
-"contactos."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy puede publicar la ubicación del usuario"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Indica si se debe mostrar la lista de contactos en salas de chat."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr ""
+"Indica si Empathy puede publicar la ubicación del usuario a sus contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Indica si se debe mostrar la lista de contactos en modo compacto."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy puede usar la red para deducir la ubicación"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Indica si se debe mostrar un mensaje de diálogo sobre cómo cerrar la ventana "
-"principal con el botón «x» en la barra de título."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Indica si Empathy puede usar la red para deducir la ubicación."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Indica si se debe usar el tema para salas de chat."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy puede usar la red telefónica móvil para deducir la ubicación"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
-"Qué criterio usar al ordenar la lista de contactos. El criterio "
-"predeterminado es ordenar por el nombre del contacto con el valor "
-"«name» (nombre). Un valor «state» (estado) ordenará la lista por el estado."
+"Indica si Empathy puede usar la red telefónica móvil para deducir la "
+"ubicación."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Gestionar las cuentas de mensajería y Voz IP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy puede usar el GPS para deducir la ubicación"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Cuentas de mensajería y Voz IP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy debería reducir la precisión de la ubicación"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Indica si Empathy debería reducir la precisión de la ubicación por motivos "
+"de privacidad."
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -558,7 +578,7 @@ msgstr "Error la intentar transferir el archivo"
 msgid "The other participant is unable to transfer the file"
 msgstr "El otro participante no puede transferir el archivo"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
@@ -594,141 +614,141 @@ msgstr "Llamó %s"
 msgid "Call from %s"
 msgstr "Llamada de %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "No se especificó ninguna razón"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "El estado se ha establecido a desconectado"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
+#: ../libempathy/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 "Error de red"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Error de cifrado"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nombre en uso"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "No se proporcionó el certificado"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certificado sin confianza"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "El certificado ha expirado"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "El certificado no está activado"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "El nombre del equipo del certificado no coincide"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "La huella del certificado no coincide"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificado firmado consigo mismo"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Error del certificado"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "El cifrado no está disponible"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "El certificado no es válido"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Se rechazó la conexión"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "No se pudo establecer la conexión"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Se perdió la conexión"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "El recurso ya está conectado al servidor"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Esta cuenta ya está conectada al servidor"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Se ha reemplazado la conexión por una conexión nueva usando el mismo recurso"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "La cuenta ya existe en el servidor"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Actualmente el servidor está demasiado ocupado para gestionar la conexión"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Se revocó el certificado"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "El certificado usa un algoritmo de cifrado inseguro o es criptográficamente "
 "débil"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -737,78 +757,82 @@ msgstr ""
 "servidor de certificados exceden los límites impuestos por la biblioteca "
 "cripotográfica"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Su software es demasiado antiguo"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Error interno"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Gente cerca"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo Japón"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "hace %d segundo"
 msgstr[1] "hace %d segundos"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hace %d minuto"
 msgstr[1] "hace %d minutos"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hace %d hora"
 msgstr[1] "hace %d horas"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hace %d día"
 msgstr[1] "hace %d días"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "hace %d semana"
 msgstr[1] "hace %d semanas"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "hace %d mes"
 msgstr[1] "hace %d meses"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "en el futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Todas las cuentas"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Cuenta"
 
@@ -826,30 +850,30 @@ msgstr "Servidor"
 msgid "Port"
 msgstr "Puerto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Aplicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Iniciar _sesión"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Esta cuenta ya existe en el servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Crear una cuenta nueva en el servidor"
 
@@ -858,137 +882,137 @@ msgstr "Crear una cuenta nueva en el servidor"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s en %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Cuenta %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Cuenta nueva"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Ejemplo:</b> MiNombreEnPantalla"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Contra_seña:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Avanzadas"
+msgid "Screen _Name:"
+msgstr "_Nombre en pantalla:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Ejemplo:</b> MiNombreEnPantalla"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Contra_seña:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Recordar contraseña"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Recordar contraseña"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Puerto:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Recordar contraseña"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nombre en pantalla:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "¿Cuál es su contraseña de AIM?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Avanzadas"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "¿Cuál es su nombre en pantalla para AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Puerto:"
+msgid "What is your AIM password?"
+msgstr "¿Cuál es su contraseña de AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Ejemplo:</b> usuario"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Recordar contraseña"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_ID de sesión:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Ejemplo:</b> usuario"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "¿Cuál es su ID de usuario para GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "¿Cuál es su contraseña de GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "_UIN ICQ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Ejemplo:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "C_onjunto de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "_UIN ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "¿Cuál es su UIN de ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "¿Cuál es su contraseña de ICQ?"
 
@@ -1025,11 +1049,23 @@ msgstr "Opciones"
 msgid "None"
 msgstr "Ninguno"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Red"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Red:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Conjunto de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servidores"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1037,14 +1073,6 @@ msgstr ""
 "La mayoría de los servidores IRC no necesitan una contraseña, de tal forma "
 "que si no está seguro, no introduzca una contraseña."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Red"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Red:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Apodo:"
@@ -1061,48 +1089,20 @@ msgstr "Mensaje de salida:"
 msgid "Real name:"
 msgstr "Nombre real:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Servidores"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "¿Cuál es su apodo del IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "¿Qué red de IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Ejemplo:</b> usuario@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Ejemplo:</b> usuario@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Requiere ci_frado (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Ignorar los errores de certificados SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Sobreescribir los ajustes del servidor"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Pri_oridad:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "¿Cuál es su apodo del IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Re_curso:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "¿Cuál es su usuario de Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1114,179 +1114,203 @@ msgstr ""
 "Use <a href=\"http://www.facebook.com/username/\">esta página</a> para "
 "elegir un nombre de usuario en Facebook si no tiene uno."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Usar SS_L antiguo"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "¿Cuál es su contraseña de Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "¿Cuál es su usuario de Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "¿Cuál es su ID de Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Ejemplo:</b> usuario@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "¿Cuál es su contraseña de Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Ejemplo:</b> usuario@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Ignorar los errores de certificados SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Pri_oridad:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Re_curso:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Requiere ci_frado (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Usar SS_L antiguo"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Sobreescribir los ajustes del servidor"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "¿Cuál es su ID de Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "¿Cuál es su contraseña de Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "¿Cuál es el ID de usuario que quiere para Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "¿Cuál es su contraseña de Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "¿Cuál es la contraseña que quiere para Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Ejemplo:</b> usuario@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "¿Cuál es su ID de Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "¿Cuál es su contraseña de Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Dirección de correo-_e:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Apo_do:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "Ape_llidos:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Nombre:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Nombre p_ublicado:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "Ape_llidos:"
+msgid "E-_mail address:"
+msgstr "Dirección de correo-_e:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Nombre p_ublicado:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Ejemplo:</b> usuario@mi.servidor.sip"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Usuario para la autenticación:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Descubrir vinculación"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Descubrir el servidor STUN automáticamente"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Usar esta cuenta para llamar a te_léfonos fijos y móviles"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorar errores TLS"
+msgid "NAT Traversal Options"
+msgstr "Opciones de NAT transversal"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervalo (segundos)"
+msgid "Proxy Options"
+msgstr "Opciones del proxy"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opciones de «keepalive»"
+msgid "Miscellaneous Options"
+msgstr "Opciones de miscelánea"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Enrutado impreciso"
+msgid "STUN Server:"
+msgstr "Servidor STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mecanismo:"
+msgid "Discover the STUN server automatically"
+msgstr "Descubrir el servidor STUN automáticamente"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Opciones de miscelánea"
+msgid "Discover Binding"
+msgstr "Descubrir vinculación"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opciones de NAT transversal"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opciones de «keepalive»"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Puerto:"
+msgid "Mechanism:"
+msgstr "Mecanismo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opciones del proxy"
+msgid "Interval (seconds)"
+msgstr "Intervalo (segundos)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Usuario para la autenticación:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transporte:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Servidor STUN:"
+msgid "Loose Routing"
+msgstr "Enrutado impreciso"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Servidor:"
+msgid "Ignore TLS Errors"
+msgstr "Ignorar errores TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transporte:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Usar esta cuenta para llamar a te_léfonos fijos y móviles"
+msgid "Port:"
+msgstr "Puerto:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "¿Cuál es la contraseña de su cuenta SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "¿Cuál es su ID de inicio de sesión SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Usuario:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "¿Cuál es la contraseña de su cuenta SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "I_D de Yahoo!:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Ignorar invitaciones a conferencias y salas de chat"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Configuración de la lista de _salas:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "¿Cuál es su ID de Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "¿Cuál es su contraseña de Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "I_D de Yahoo!:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Configuración de la lista de _salas:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1349,40 +1373,40 @@ msgstr "Este protocolo no soporta llamadas de emergencia"
 msgid "You don't have enough credit in order to place this call"
 msgstr "No tiene crédito suficiente para hacer esta llamada"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Falló al abrir el chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "El tema no está soportado en esta conversación"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "No le está permitido cambiar el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "%s no es un identificador de contacto válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: limpiar todos los mensajes de la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: establecer el tema para la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id de sala de chat>: unirse a una sala de chat nueva"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id de sala de chat>: unirse a una sala de chat nueva"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1390,23 +1414,23 @@ msgstr ""
 "/part [<ID de la sala de chat>] [<razón>]: abandonar la sala de chat, la "
 "actual de manera predeterminada"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <apodo>: cambiar su apodo en el servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mensaje>: enviar un mensaje de ACCIÓN a la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1416,11 +1440,11 @@ msgstr ""
 "para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa "
 "para unirse a una sala de chat nueva»"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID del contacto>: mostrar información sobre un contacto"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1428,122 +1452,128 @@ msgstr ""
 "/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está "
 "definido, muestra su uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando desconocido; consulte /help para ver los comandos disponibles"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "no tiene balance suficiente para enviar el mensaje"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Error al enviar el mensaje «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Error al enviar el mensaje: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "no tiene balance suficiente para enviar el mensaje. <a href='%s'>Recargar</"
 "a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "no es posible"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "contacto no válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "permiso denegado"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "mensaje demasiado largo"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "no implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "El tema se ha establecido a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Tema establecido por %s a: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "No se ha definido el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Sin sugerencias)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Añadir «%s» al diccionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Añadir «%s» al diccionario de «%s»"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "E_nviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Sugerencias ortográficas"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Falló al recibir los registros recientes"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s se ha desconectado"
@@ -1551,12 +1581,12 @@ msgstr "%s se ha desconectado"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s expulsó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s fue expulsado"
@@ -1564,17 +1594,17 @@ msgstr "%s fue expulsado"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s vetó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s fue vetado"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ha dejado la sala"
@@ -1584,17 +1614,17 @@ msgstr "%s ha dejado la sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ha entrado en la sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Ahora %s se llama %s"
@@ -1602,55 +1632,55 @@ msgstr "Ahora %s se llama %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../libempathy-gtk/empathy-chat.c:2993
 #: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "¿Quiere guardar esta contraseña?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Recordar"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Ahora no"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Volver a intentarlo"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Contraseña incorrecta; inténtelo de nuevo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protegida por contraseña:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Conversación"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1682,10 +1712,10 @@ msgstr "Editar contactos bloqueados"
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Cuenta:"
 
@@ -1695,7 +1725,7 @@ msgstr "Contactos bloqueados"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Quitar"
@@ -1718,34 +1748,30 @@ msgstr "_Abrir enlace"
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Información personal"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "¿Bloquear a %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "¿Está seguro de que quiere bloquear a «%s» para que no le vuelva a contactar?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1753,17 +1779,17 @@ msgstr[0] "Info_rmar de este contacto como abusivo"
 msgstr[1] "Info_rmar de estos contacto como abusivos"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decidir _luego"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Petición de suscripción"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Bloquear usuario"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decidir _luego"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1918,7 +1944,7 @@ msgstr "Altitud:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Ubicación geográfica"
 
@@ -1935,15 +1961,25 @@ msgid "%B %e, %Y at %R UTC"
 msgstr "%e de %B de %Y a las %R UTC"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:999
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Guardar avatar"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:1055
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "No se pudo guardar el avatar"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Detalles personales"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Detalles del contacto"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Nombre completo"
@@ -2009,54 +2045,49 @@ msgstr "postal"
 msgid "parcel"
 msgstr "grupo"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Ubicación</b> en (fecha)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Identificador:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Apodo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Información del cliente"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Cliente:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Ubicación</b> en (fecha)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Detalles del contacto"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Información solicitadas"
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
-msgid "Identifier:"
-msgstr "Identificador:"
+msgid "Client Information"
+msgstr "Información del cliente"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Información solicitadas"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "SO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versión:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Cliente:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2064,17 +2095,17 @@ msgstr ""
 "Seleccione los grupos en los que quiere que este contacto aparezca, Note que "
 "puede seleccionar más de un grupo o ningún grupo."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Añadir grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1949
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupo"
 
@@ -2094,158 +2125,140 @@ msgstr[1] "No se pueden bloquear la siguientes identidades:"
 msgid "Edit Contact Information"
 msgstr "Editar información del contacto"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Contactos enlazados"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Seleccionar contactos para enlazar"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Vista previa del contacto nuevo"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
-"Se enlazarán entre sí los contactos seleccionados en la lista de la "
-"izquierda."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Seleccionar la cuenta que usar para realizar la llamada"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Llamar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Móvil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Casa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Bloquear contacto"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Chat"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Llamada de vo_z"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Llamada de _vídeo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Conversaciones an_teriores"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Compartir mi escritorio"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Favorita"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts no está instalado"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Instale gnome-contacts para acceder a los detalles de los contactos."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Enlazar contactos…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1175
 msgid "Inviting you to this room"
 msgstr "Invitándolo a esta sala"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Invitar a sala de chat"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-main-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Añadir contacto…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Eliminar y _bloquear"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "¿Realmente quiere quitar el grupo «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Quitando grupo"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "¿Realmente quiere quitar el contacto «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2254,11 +2267,11 @@ msgstr ""
 "¿Realmente quiere quitar el contacto enlazado «%s»? Tenga en cuenta que esto "
 "quitará todos los contactos que componen este contacto enlazado."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Quitando el contacto"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2269,23 +2282,23 @@ msgstr[1] "Contacto enlazado que contiene %u contactos"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Ubicación</b> en (fecha)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Conectado desde un teléfono o un dispositivo móvil"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Red nueva"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Elegir una red IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Rei_niciar lista de redes"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Seleccionar"
@@ -2298,51 +2311,6 @@ msgstr "servidor nuevo"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Enlazar contactos"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Desenlazar…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Separar completamente los contactos enlazados mostrados en contactos "
-"separados."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Enlazar"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "¿Desenlazar los contactos enlazados «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"¿Está seguro de querer desenlazar estos contactos enlazados? Esto separará "
-"completamente los contactos enlazados en contactos separados."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Desenlazar"
-
 #: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Histórico"
@@ -2443,7 +2411,7 @@ msgid "Text chats"
 msgstr "Chats de texto"
 
 #: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Llamadas"
 
@@ -2478,42 +2446,42 @@ msgid "Delete from:"
 msgstr "Eliminar de:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Cargando…</span>"
+msgid "_File"
+msgstr "_Archivo"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chat"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Borrar todo el histórico…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Vídeo"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Chat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Editar"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Vídeo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Archivo"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "pa�gina 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Cargando…</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "El contacto está desconectado"
@@ -2645,20 +2613,20 @@ msgid "Find:"
 msgstr "Buscar:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Coincidir con capitalización"
+msgid "_Previous"
+msgstr "_Anterior"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "No se encontró la frase"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Siguiente"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Coincidir con capitalización"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Anterior"
+msgid "Phrase not found"
+msgstr "No se encontró la frase"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2704,12 +2672,12 @@ msgstr "Finalizó la llamada de voz"
 msgid "Edit Custom Messages"
 msgstr "Editar mensajes personalizados"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensaje editado a las %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2788,34 +2756,38 @@ msgid "Certificate hostname: %s"
 msgstr "Nombre del servidor de certificados: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continuar"
+msgid "C_ontinue"
+msgstr "C_ontinuar"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "La conexión no es de confianza"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Esta conexión no es de confianza. ¿Quiere continuar de todas formas?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Recordar esta opción para futuras conexiones"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalles del certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "No se pudo abrir el URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Seleccionar un archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "No hay espacio suficiente para guardar el archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2824,7 +2796,7 @@ msgstr ""
 "Se requiere %s de espacio libre para guardar este archivo, pero sólo hay %s "
 "disponible. Elija otra ubicación."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Archivo entrante de %s"
@@ -3077,233 +3049,73 @@ msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2010\n"
 "Daniel Mustieles <daniel.mustieles@gmail.com>, 2010"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Hubo un error al importar las cuentas."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Hubo un error al analizar los detalles de la cuenta."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Hubo un error al crear la cuenta."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Hubo un error."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "El mensaje de error fue: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Puede volver atrás e intentar introducir los detalles de su cuenta de nuevo "
-"o salir de este asistente y añadir cuentas posteriormente desde el menú "
-"Editar."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Ocurrió un error"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "¿Qué tipo de cuenta tiene?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "¿Tiene otras cuentas de chat que quiera configurar?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Introducir los detalles de su cuenta"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "¿Qué tipo de cuenta quiere crear?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "¿Quiere crear otras cuentas de chat?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Introducir los detalles para la cuenta nueva"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Con Empathy puede charlar con gente cerca y con amigos y colegas que usen "
-"Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un "
-"micrófono o una cámara web puede hacer incluso llamadas de voz o vídeo."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Sí, importar los detalles de mi cuenta desde "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Sí, introduciré ahora los detalles de mi cuenta"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "No, quiero crear una cuenta nueva"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "No, por ahora sólo quiero ver la gente conectada cerca"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Seleccione las cuentas que quiere importar:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Sí"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "No, eso es todo por ahora"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy puede descubrir automáticamente las personas conectadas en su misma "
-"red para poder chatear con ellas. Si quiere usar esta característica "
-"compruebe que los detalles de abajo son correctos. Puede cambiar fácilmente "
-"estos detalles posteriormente o desactivar esta característica usando el "
-"diálogo «Cuentas»."
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Editar->Cuentas"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "_No quiero activar esta característica por ahora"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"No podrá chatear con las personas conectadas en su red local, ya que "
-"telepathy-salut no está instalado. Si quiere activar esta característica "
-"instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde el "
-"diálogo Cuentas."
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut no está instalado"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asistente de cuentas de mensajería y Voz IP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Bienvenido a Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Importar sus cuentas existentes"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Introduzca los detalles personales"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:71
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Existen modificaciones sin guardar en su cuenta %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:75
 msgid "Your new account has not been saved yet."
 msgstr "Aún no se ha guardado su cuenta nueva."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:347
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado: %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado: %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "Desconectado: sin conexión de red"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
 msgstr "Desconectado: cuenta desactivada"
 
-#: ../src/empathy-accounts-dialog.c:538
-#| msgid "Connection has been refused"
+#: ../src/empathy-accounts-dialog.c:533
 msgid "Edit Connection Parameters"
 msgstr "Editar los parámetros de la conexión"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:696
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Falló al recuperar su información personal del servidor."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:702
 msgid "Go online to edit your personal information."
 msgstr "Conéctese para editar su información personal."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:787
 msgid "_Edit Connection Parameters..."
 msgstr "_Editar los parámetros de la conexión…"
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1283
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "¿Quiere quitar %s de su equipo?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1287
 msgid "This will not remove your account on the server."
 msgstr "Esto no quitará su cuenta del servidor."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3312,15 +3124,24 @@ msgstr ""
 "¿Seguro que quiere continuar?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Omitir"
+
+#: ../src/empathy-accounts-dialog.c:2087
+#| msgid "Connected"
+msgid "_Connect"
+msgstr "_Conectar"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3332,19 +3153,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Añadir…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Cargando información de la cuenta"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "No hay protocolos instalados"
+msgid "_Import…"
+msgstr "_Importar…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocolo:"
+msgid "Loading account information"
+msgstr "Cargando información de la cuenta"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3352,9 +3169,9 @@ msgstr ""
 "Para añadir una nueva cuenta debe instalar primero un «backend» para cada "
 "protocolo que quiera usar."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importar…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "No hay «backends» de protocolos instalados"
 
 #: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
@@ -3364,15 +3181,11 @@ msgstr ": Cliente de autenticación de Empathy"
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticación de Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Gente cerca"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr ": Cliente de sonido/vídeo Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de sonido/vídeo Empathy"
 
@@ -3415,33 +3228,33 @@ msgstr "Detalles"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Llamada con %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "La dirección IP como la ve la máquina"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "La dirección IP como la ve el servidor de Internet"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "La dirección IP del par como la ve la otra parte"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "La dirección IP de un servidor de desvío"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "La dirección IP del grupo multicast"
 
@@ -3460,12 +3273,12 @@ msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
 #: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3475,7 +3288,7 @@ msgstr ""
 "por su equipo"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3485,7 +3298,7 @@ msgstr ""
 "por su equipo"
 
 #: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3495,12 +3308,12 @@ msgstr ""
 "una red que no acepta conexiones directas."
 
 #: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "Hubo un fallo en la red"
 
 #: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-call-window.c:3100
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3508,7 +3321,7 @@ msgstr ""
 "llamada"
 
 #: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-call-window.c:3103
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3516,7 +3329,7 @@ msgstr ""
 "llamada"
 
 #: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3528,261 +3341,308 @@ msgstr ""
 "de «Depuración» en el menú de Ayuda."
 
 #: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "Hubo un fallo en el motor de llamadas"
 
 #: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "Se llegó al final del flujo"
 
 #: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "No se puede establecer el flujo de voz"
 
 #: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "No se puede establecer el flujo de vídeo"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Sonido"
+msgid "_Call"
+msgstr "_Llamar"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Códec de decodificación:"
+msgid "_Microphone"
+msgstr "_Micro�fono"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Desactivar cámara"
+msgid "_Camera"
+msgstr "_Ca�mara"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Mostrar el teclado de llamada"
+msgid "_Settings"
+msgstr "_Configuracio�n"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Códec de codificación:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Ver"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Colgar"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "Ay_uda"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Colgar la llamada actual"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "�nd_ice"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Candidato local:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Depurar"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximizarme"
+msgid "Swap camera"
+msgstr "Intercambiar cámara"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimizarme"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Candidato remoto:"
+msgid "Maximise me"
+msgstr "Maximizarme"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Enviar voz"
+msgid "Disable camera"
+msgstr "Desactivar cámara"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Colgar"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Mostrar teclado de llamada"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Colgar la llamada actual"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Llamada de vídeo"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Iniciar una llamada de vídeo"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Iniciar una llamada de voz"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Intercambiar cámara"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Conmutar la transmisión de voz"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Conmutar la transmisión de vídeo"
+msgid "Show dialpad"
+msgstr "Mostrar teclado de llamada"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "Desconocido"
+msgid "Display the dialpad"
+msgstr "Mostrar el teclado de llamada"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Enviar vídeo"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Llamada de vídeo"
+msgid "Toggle video transmission"
+msgstr "Conmutar la transmisión de vídeo"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Llamar"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Enviar voz"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Ca�mara"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "�nd_ice"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Conmutar la transmisión de voz"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Depurar"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Códec de codificación:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Ay_uda"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Códec de decodificación:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Micro�fono"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Candidato remoto:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Configuracio�n"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Candidato local:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Ver"
+msgid "Audio"
+msgstr "Sonido"
+
+#: ../src/empathy-chat-window.c:285
+msgid "Close this window?"
+msgstr "¿Cerrar esta ventana?"
+
+#: ../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 ""
+"Cerrar esta ventana hará que abandone %s. No recibirá más mensajes hasta que "
+"se una de nuevo."
+
+#: ../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] ""
+"Cerrar esta ventana hará que abandone una sala de chat. No recibirá más "
+"mensajes hasta que se una de nuevo."
+msgstr[1] ""
+"Cerrar esta ventana hará que abandone %u salas de chat. No recibirá más "
+"mensajes hasta que se una a ellas de nuevo."
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+msgid "Leave %s?"
+msgstr "¿Cerrar %s?"
+
+#: ../src/empathy-chat-window.c:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "No recibirá más mensajes de este chat hasta que se una de nuevo."
+
+#: ../src/empathy-chat-window.c:330
+msgid "Close window"
+msgstr "Cerrar la ventana"
+
+#: ../src/empathy-chat-window.c:330
+msgid "Leave room"
+msgstr "Abandonar la sala"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d sin leer)"
 msgstr[1] "%s (%d sin leer)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (y otra)"
 msgstr[1] "%s (y otras %u)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d sin leer de otros)"
 msgstr[1] "%s (%d sin leer de otros)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d sin leer de todos)"
 msgstr[1] "%s (%d sin leer de todos)"
 
-#: ../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"
 msgstr[0] "Enviando %d mensaje"
 msgstr[1] "Enviando %d mensajes"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
 msgstr "Tecleando un mensaje."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Limpiar"
+msgid "_Conversation"
+msgstr "_Conversación"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "C_ontacto"
+msgid "C_lear"
+msgstr "_Limpiar"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Insertar _emoticono"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "Sala de chat _favorita"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Invitar pa_rticipante…"
+msgid "Notify for All Messages"
+msgstr "Notificar para todos los mensajes"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Mover pestaña a la _izquierda"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Mostrar lista de contactos"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Mover pestaña a la _derecha"
+msgid "Invite _Participant…"
+msgstr "Invitar pa_rticipante…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notificar para todos los mensajes"
+msgid "C_ontact"
+msgstr "C_ontacto"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Conversación"
+msgid "_Tabs"
+msgstr "_Pestañas"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Desacoplar pestaña"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "Sala de chat _favorita"
+msgid "_Previous Tab"
+msgstr "Pestaña _anterior"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "Pestaña _siguiente"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "Pestaña _anterior"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Deshacer cerrar pestaña"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Mostrar lista de contactos"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Mover pestaña a la _izquierda"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Pestañas"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Mover pestaña a la _derecha"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Deshacer cerrar pestaña"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Desacoplar pestaña"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3796,7 +3656,7 @@ msgstr "Sala"
 msgid "Auto-Connect"
 msgstr "Autoconectar"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Gestionar salas favoritas"
 
@@ -3804,7 +3664,7 @@ msgstr "Gestionar salas favoritas"
 msgid "Incoming video call"
 msgstr "Llamada de vídeo entrante"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
@@ -3819,7 +3679,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s le está llamando. ¿Quiere responder?"
 
 #: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Llamada entrante de %s"
@@ -3837,7 +3697,7 @@ msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
 #: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Llamada de vídeo entrante de %s"
@@ -3861,7 +3721,7 @@ msgid "_Decline"
 msgstr "_Rechazar"
 
 #: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Unirse"
 
@@ -3880,7 +3740,7 @@ msgstr "Le han invitado a unirse a %s"
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de archivo entrante de %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Se requiere una contraseña"
 
@@ -4011,7 +3871,11 @@ msgstr ""
 "Eliminar transferencias de archivo completadas, canceladas y fallidas de la "
 "lista"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importar"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4019,170 +3883,185 @@ msgstr ""
 "No se pudo encontrar ninguna cuenta que importar. Actualmente Empathy sólo "
 "soporta importar cuentas desde Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importar cuentas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Origen"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Escriba su contraseña"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/empathy-main-window.c:635
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Debe configurar una cuenta para ver contactos aquí."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "No se encontró ninguna coincidencia"
 
-#: ../src/empathy-main-window.c:743
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "Las cuentas de %s no se pueden usar hasta que no se haya actualizado su "
 "software de %s."
 
-#: ../src/empathy-main-window.c:811
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Actualizar software…"
 
-#: ../src/empathy-main-window.c:817 ../src/empathy-main-window.c:938
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../src/empathy-main-window.c:926
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-main-window.c:932
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Editar cuenta"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1071
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Recargar %s (%s)…"
 
-#: ../src/empathy-main-window.c:1118
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Recargar el saldo de la cuenta"
 
 #. top up button
-#: ../src/empathy-main-window.c:1189
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Recargar…"
 
-#: ../src/empathy-main-window.c:1931
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../src/empathy-main-window.c:2306
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Debe activar una de sus cuentas para ver contactos aquí."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Debe activar %s para ver contactos aqui�."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Contactos en el _mapa"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Configuración de la cuenta"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Crédito"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "Conversación _nueva…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "_Buscar en la lista de contactos"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "_Llamada nueva…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Unirse a _favoritas"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Buscar contactos…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Gestionar favoritos"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Transferencias de archivos"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "Tamaño n_ormal"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Contactos _desconectados"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "_Llamada nueva…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Mostrar p_rotocolos"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Tamaño normal con _avatares"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Crédito"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Contactos en el _mapa"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Cuentas"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "Contactos _bloqueados"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "Prefere_ncias"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Mostrar p_rotocolos"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "_Buscar en la lista de contactos"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Ordenar por _nombre"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Ordenar por es_tado"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Cuentas"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Tamaño normal con _avatares"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "Contactos _bloqueados"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "Tamaño n_ormal"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "Tamaño _compacto"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Transferencias de archivos"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Sala"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Unirse…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "Conversación _nueva…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Contactos _desconectados"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Información p_ersonal"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Sala"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Unirse a _favoritas"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Buscar contactos…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Gestionar favoritos"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4194,7 +4073,7 @@ msgstr "Miembros"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4207,22 +4086,27 @@ msgstr ""
 "Se necesita contraseña: %s\n"
 "Miembros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Sí"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "No se pudo iniciar la lista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "No se pudo parar la lista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "No se pudo cargar la lista de la sala"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Unirse a sala"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4232,6 +4116,10 @@ msgstr ""
 "la lista."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Sala:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4239,18 +4127,14 @@ msgstr ""
 "Introduzca el servidor que aloja la sala o déjelo vacío si la sala está en "
 "la cuenta del servidor actual"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Unirse a sala"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "No se pudo cargar la lista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Lista de salas"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Sala:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Mensaje recibido"
@@ -4264,7 +4148,7 @@ msgid "New conversation"
 msgstr "Conversación nueva"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "El contacto se conecta"
 
 #: ../src/empathy-preferences.c:170
@@ -4284,263 +4168,271 @@ msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "¡Oh, Romeo, Romeo!, ¿dónde estás que no te veo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Niega a tu padre y rehúsa tu nombre;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "O, si no quieres, júrame tan sólo que me amas"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Y dejaré yo de ser una Capuleto"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "¿Debo oír más o contestar a lo dicho?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julieta se ha desconectado"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferencias"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Mostrar los _emoticonos como imágenes"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Mostrar _lista de contactos en salas"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Comportamiento"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Iniciar chats en:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Tema del chat:"
+msgid "new ta_bs"
+msgstr "pestañas nue_vas"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Desactivar notificaciones al _ausentarse o estar ocupado"
+msgid "new _windows"
+msgstr "v_entanas nuevas"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Desactivar sonidos al _ausentarse o estar ocupado"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Mostrar los eventos entrantes en el área de notificación"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "C_onectarse automáticamente al inicio"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"La cancelación de eco le ayuda a que la otra persona oiga su voz de forma "
-"más clara pero puede causar problemas en algunos equipos. Si usted o la otra "
-"persona oyen ruidos o tienen problemas durante las llamadas, intente "
-"desactivar la cancelación de eco y reiniciar la llamada."
+msgid "Log conversations"
+msgstr "Registrar conversaciones"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Activar notificaciones cuando un contacto se conecta"
+msgid "Behavior"
+msgstr "Comportamiento"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Activar notificaciones cuando un contacto se desconecta"
+msgid "General"
+msgstr "General"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Activar notificaciones cuando el _chat no tenga el foco"
+msgid "_Enable bubble notifications"
+msgstr "_Activar notificaciones de burbuja"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Activar la revisión ortográfica para idiomas:"
+msgid "Disable notifications when _away or busy"
+msgstr "Desactivar notificaciones al _ausentarse o estar ocupado"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "General"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Activar notificaciones cuando el _chat no tenga el foco"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Activar notificaciones cuando un contacto se conecta"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Orígenes de las ubicaciones:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Activar notificaciones cuando un contacto se desconecta"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Registrar conversaciones"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Notificaciones"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Activar notificaciones de sonido"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Reproducir sonido para eventos"
+msgid "Disable sounds when _away or busy"
+msgstr "Desactivar sonidos al _ausentarse o estar ocupado"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Privacidad"
+msgid "Play sound for events"
+msgstr "Reproducir sonido para eventos"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Reducir la precisión de la ubicación significa que no se publicará nada más "
-"preciso que su ciudad, estado y país. Las coordenadas GPS tendrán un valor "
-"aleatorio añadido 1 lugar decimal."
-
-#: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Mostrar los _emoticonos como imágenes"
-
-#: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Mostrar _lista de contactos en salas"
-
-#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Revisión ortográfica"
+#: ../src/empathy-preferences.ui.h:22
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Usar cancelación de _eco para mejorar la calidad de las llamadas"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"La lista de idiomas refleja sólo los idiomas para los cuales tiene un "
-"diccionario instalado."
+"La cancelación de eco le ayuda a que la otra persona oiga su voz de forma "
+"más clara pero puede causar problemas en algunos equipos. Si usted o la otra "
+"persona oyen ruidos o tienen problemas durante las llamadas, intente "
+"desactivar la cancelación de eco y reiniciar la llamada."
 
-#: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Temas"
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Publicar mi ubicación a mis contactos"
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Usar cancelación de _eco para mejorar la calidad de las llamadas"
+#: ../src/empathy-preferences.ui.h:27
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"Reducir la precisión de la ubicación significa que no se publicará nada más "
+"preciso que su ciudad, estado y país. Las coordenadas GPS tendrán un valor "
+"aleatorio añadido 1 lugar decimal."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "Variante:"
+msgid "_Reduce location accuracy"
+msgstr "_Reducir la precisión de la ubicación"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "C_onectarse automáticamente al inicio"
+msgid "Privacy"
+msgstr "Privacidad"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "Teléfono _móvil"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Activar notificaciones de burbuja"
+msgid "_Cellphone"
+msgstr "Teléfono _móvil"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Activar notificaciones de sonido"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Red (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Orígenes de las ubicaciones:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Abrir charlas nuevas en ventanas separadas"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"La lista de idiomas refleja sólo los idiomas para los cuales tiene un "
+"diccionario instalado."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Publicar mi ubicación a mis contactos"
+msgid "Enable spell checking for languages:"
+msgstr "Activar la revisión ortográfica para idiomas:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Revisión ortográfica"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "_Reducir la precisión de la ubicación"
+msgid "Chat Th_eme:"
+msgstr "_Tema del chat:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variante:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Temas"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Estado"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Llamar de nuevo al contacto"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Cámara apagada"
+msgid "Redial"
+msgstr "Volver a llamar"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Cámara encendida"
+msgid "V_ideo"
+msgstr "Ví_deo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Vídeo apagado"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desactivar la cámara y dejar de enviar vídeo"
+msgid "Video Preview"
+msgstr "Vista preliminar del vídeo"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Activar la cámara y enviar vídeo"
+msgid "Video On"
+msgstr "Vídeo encendido"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Activar la cámara pero no enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Llamar de nuevo al contacto"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Vista previa"
+msgid "Camera Off"
+msgstr "Cámara apagada"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Volver a llamar"
+msgid "Disable camera and stop sending video"
+msgstr "Desactivar la cámara y dejar de enviar vídeo"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "Ví_deo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Vista previa"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Vídeo apagado"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Activar la cámara pero no enviar vídeo"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Vídeo encendido"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Cámara encendida"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Vista preliminar del vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Activar la cámara y enviar vídeo"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
@@ -4623,35 +4515,31 @@ msgstr "Elegir un contacto para invitar a la conversación:"
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "No mostrar ningún diálogo; realizar cualquier trabajo (ej. importar) y salir"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "No mostrar ningún diálogo a no ser que sólo existan cuentas «Gente cerca»"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Cuenta proporcionada inicialmente seleccionada (ej. gabble/jabber/ejemplo)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<id-de-cuenta>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Mostrar el asistente de cuentas"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr ": Cuentas en Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Cuentas en Empathy"
 
@@ -4667,7 +4555,7 @@ msgstr "- Depurador de Empathy"
 msgid "Empathy Debugger"
 msgstr "Depurador de Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr ": Cliente de chat Empathy"
 
@@ -4676,13 +4564,13 @@ msgid "Respond"
 msgstr "Respuesta"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Rechazar"
 
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "Responder"
 
@@ -4714,38 +4602,38 @@ msgstr "%s intentó llamarle, pero estaba en otra llamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "Información"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Duracio�n"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s: %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3214
 #, c-format
 msgid "Your current balance is %s."
 msgstr "su balance actual es %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3218
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "No tiene crédito suficiente para hacer esta llamada."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3220
 msgid "Top Up"
 msgstr "Recargar"
 
@@ -4753,11 +4641,209 @@ msgstr "Recargar"
 msgid "_Match case"
 msgstr "_Coincidir con capitalizacio�n"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "¿Qué tipo de cuenta tiene?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
-#| msgid "New account"
 msgid "Adding new account"
 msgstr "Añadiendo cuenta nueva"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Gente cerca"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+#| msgid ""
+#| "Empathy can automatically discover and chat with the people connected on "
+#| "the same network as you. If you want to use this feature, please check "
+#| "that the details below are correct. You can easily change these details "
+#| "later or disable this feature by using the 'Accounts' dialog"
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy puede descubrir automáticamente las personas conectadas en su misma "
+"red para poder chatear con ellas. Si quiere usar esta característica "
+"compruebe que los detalles de abajo son correctos."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+" Puede cambiar fácilmente estos detalles posteriormente o desactivar esta "
+"característica eligiendo <span style=\"italic\">Editar → Cuentas</span> en "
+"la lista de contactos."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Hubo un error al importar las cuentas."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Hubo un error al analizar los detalles de la cuenta."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Hubo un error al crear la cuenta."
+
+#~ msgid "There was an error."
+#~ msgstr "Hubo un error."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "El mensaje de error fue: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Puede volver atrás e intentar introducir los detalles de su cuenta de "
+#~ "nuevo o salir de este asistente y añadir cuentas posteriormente desde el "
+#~ "menú Editar."
+
+#~ msgid "An error occurred"
+#~ msgstr "Ocurrió un error"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "¿Tiene otras cuentas de chat que quiera configurar?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Introducir los detalles de su cuenta"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "¿Qué tipo de cuenta quiere crear?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "¿Quiere crear otras cuentas de chat?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Introducir los detalles para la cuenta nueva"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Con Empathy puede charlar con gente cerca y con amigos y colegas que usen "
+#~ "Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un "
+#~ "micrófono o una cámara web puede hacer incluso llamadas de voz o vídeo."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Sí, importar los detalles de mi cuenta desde "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Sí, introduciré ahora los detalles de mi cuenta"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "No, quiero crear una cuenta nueva"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "No, por ahora sólo quiero ver la gente conectada cerca"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Seleccione las cuentas que quiere importar:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "No, eso es todo por ahora"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Editar->Cuentas"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "_No quiero activar esta característica por ahora"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "No podrá chatear con las personas conectadas en su red local, ya que "
+#~ "telepathy-salut no está instalado. Si quiere activar esta característica "
+#~ "instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde "
+#~ "el diálogo Cuentas."
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut no está instalado"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Asistente de cuentas de mensajería y Voz IP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Bienvenido a Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importar sus cuentas existentes"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Introduzca los detalles personales"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Mostrar el asistente de cuentas"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protocolo:"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Seleccionar contactos para enlazar"
+
+#~ msgid "New contact preview"
+#~ msgstr "Vista previa del contacto nuevo"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr ""
+#~ "Se enlazarán entre sí los contactos seleccionados en la lista de la "
+#~ "izquierda."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Enlazar contactos…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Enlazar contactos"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Desenlazar…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Separar completamente los contactos enlazados mostrados en contactos "
+#~ "separados."
+
+#~ msgid "_Link"
+#~ msgstr "_Enlazar"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "¿Desenlazar los contactos enlazados «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "¿Está seguro de querer desenlazar estos contactos enlazados? Esto "
+#~ "separará completamente los contactos enlazados en contactos separados."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Desenlazar"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Contactos enlazados"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Abrir charlas nuevas en ventanas separadas"
+
+#~ msgid "Personal Information"
+#~ msgstr "Información personal"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Información p_ersonal"
+
 #~ msgid "Socket type not supported"
 #~ msgstr "El tipo de socket no está soportado"
 
@@ -5058,9 +5144,6 @@ msgstr "Añadiendo cuenta nueva"
 #~ "Se le ha ofrecido una invitación para el servicio %s pero no tiene la "
 #~ "aplicación necesaria para manejarla"
 
-#~ msgid "User requested disconnect"
-#~ msgstr "Desconexión solicitada por el usuario"
-
 #~ msgid "<b>Location</b>"
 #~ msgstr "<b>Ubicación</b>"
 
diff --git a/po/et.po b/po/et.po
index c27a1c552..db56c2768 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: empathy MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-12-31 12:40+0000\n"
-"PO-Revision-Date: 2012-01-02 01:22+0200\n"
+"POT-Creation-Date: 2012-02-16 10:06+0000\n"
+"PO-Revision-Date: 2012-02-16 13:20+0200\n"
 "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <>\n"
 "Language: et\n"
@@ -23,71 +23,98 @@ msgstr ""
 "X-Poedit-Language: Estonian\n"
 "X-Poedit-Country: ESTONIA\n"
 
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Vestlus Google Talki, Facebooki, MSN-i ja paljude teiste vestlusteenuste "
-"kaudu"
-
 msgid "Empathy"
 msgstr "Empathy"
 
-msgid "Empathy Internet Messaging"
-msgstr "Empathy interneti sõnumivahetus"
-
 msgid "IM Client"
 msgstr "Välksõnumiklient"
 
-msgid "Always open a separate chat window for new chats."
-msgstr "Uutele vestlustele avatakse alati eraldi aken."
+msgid "Empathy Internet Messaging"
+msgstr "Empathy interneti sõnumivahetus"
 
-msgid "Camera device"
-msgstr "Kaameraseade"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Vestlus Google Talki, Facebooki, MSN-i ja paljude teiste vestlusteenuste "
+"kaudu"
 
-msgid "Camera position"
-msgstr "Kaamera asukoht"
+msgid "Connection managers should be used"
+msgstr "Kas peab ühenduste haldureid kasutama"
 
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
-"Märk, mis lisatakse hüüdnime lõppu, kui jututoas kasutatakse nime "
-"automaatlõpetust (tab-klahv)."
+"Kas automaatseks lahti- või taasühendumiseks tuleks kasutada ühenduste "
+"haldurit või mitte."
 
-msgid "Chat window theme"
-msgstr "Jututoaakende teema"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy peaks käivitumisel ise ühenduma"
 
-msgid "Chat window theme variant"
-msgstr "Jututoaakende teema"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Kas Empathy peaks käivitumisel ise kontodesse sisse logima."
+
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy peaks jõudeoleku korral automaatselt eemaloleku määrama"
 
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Komadega eraldatud loend õigekirjakontrolli keeltest (nt \"et, en, fi, ru\")."
+"Kas Empathy peaks jõudeoleku korral määrama olekuks automaatselt eemaloleku."
+
+msgid "Empathy default download folder"
+msgstr "Empathy vaikimisi allalaadimiste kataloog"
+
+msgid "The default folder to save file transfers in."
+msgstr "Vaikimisi kataloog, kuhu salvestada vastuvõetud failid."
+
+msgid "Show offline contacts"
+msgstr "Ühendamata sõpru näidatakse"
+
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Kas näidata kontaktide nimekirjas kontakte, kes pole ühendatud."
+
+msgid "Show avatars"
+msgstr "Näidatakse avatare"
+
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Kas näidata kontaktide nimekirjas ja vestlusakendes avatare."
+
+msgid "Show protocols"
+msgstr "Kuva protokolle"
+
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Kas näidata kontaktide nimekirjas kontaktide protokolle."
+
+msgid "Show Balance in contact list"
+msgstr "Kontaktide nimekirjas näidatakse kontojääki"
+
+msgid "Whether to show account balances in the contact list."
+msgstr "Kas näidata kontaktide nimekirjas kontojääki."
 
 msgid "Compact contact list"
 msgstr "Kompaktne sõbranimekiri"
 
-msgid "Connection managers should be used"
-msgstr "Kas peab ühenduste haldureid kasutama"
-
-msgid "Contact list sort criterion"
-msgstr "Kontaktide nimekirja sortimise alus"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Kas kontaktide nimekirja kuvatakse kompaktvaates või mitte."
 
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "Toaga ühinemiseks viimati valitud konto D-Busi objekti asukoht"
+msgid "Hide main window"
+msgstr "Peida peaaken"
 
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Vaikimisi kaameraseade, mida kasutatakse videokõnede jaoks, nt /dev/video0"
+msgid "Hide the main window."
+msgstr "Peaakna peitmine."
 
 msgid "Default directory to select an avatar image from"
 msgstr "Vaikimisi kataloog, millest valida avatari pilti"
 
-msgid "Disable popup notifications when away"
-msgstr "Eemalolekul on hüpikmärguanded keelatud"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Kataloog, kust viimati valiti avatari pilt."
 
-msgid "Disable sounds when away"
-msgstr "Heliteated on minu eemaloleku korral keelatud"
+msgid "Open new chats in separate windows"
+msgstr "Uued jututoad avatakse eraldi akendes"
+
+msgid "Always open a separate chat window for new chats."
+msgstr "Uutele vestlustele avatakse alati eraldi aken."
 
 msgid "Display incoming events in the status area"
 msgstr "Sündmuste kuvamine teatealal"
@@ -99,289 +126,278 @@ msgstr ""
 "Saabuvate sündmuste kuvamine teatealal. Kui väär, näidatakse neid kasutajale "
 "otse."
 
-msgid "Echo cancellation support"
-msgstr "Kaja vähendamise tugi"
-
-msgid "Empathy can publish the user's location"
-msgstr "Empathy tohib näidata kasutaja asukohta"
-
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy tohib kasutada GPS-i andmeid asukoha arvamiseks"
-
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy tohib kasutada mobiilivõrku asukoha arvamiseks"
-
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy tohib kasutada võrku asukoha arvamiseks"
-
-msgid "Empathy default download folder"
-msgstr "Empathy vaikimisi allalaadimiste kataloog"
-
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy peaks jõudeoleku korral automaatselt eemaloleku määrama"
-
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy peaks käivitumisel ise ühenduma"
+msgid "The position for the chat window side pane"
+msgstr "Vestlusakna külgpaneeli asukoht"
 
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy peaks vähendama asukoha täpsust"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Vestlusakna külgpaneeli asukoht (pikslites)."
 
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy peaks kasutama avatari vestlusakna ikoonina"
+msgid "Show contact groups"
+msgstr "Kontaktide gruppide kuvamine"
 
-msgid "Enable WebKit Developer Tools"
-msgstr "WebKit Developer tööriistade lubamine"
+msgid "Whether to show groups in the contact list."
+msgstr "Kas näidata kontaktide nimekirjas gruppe."
 
-msgid "Enable popup notifications for new messages"
-msgstr "Uute sõnumite hüpikmärguanded on lubatud"
+msgid "Contact list sort criterion"
+msgstr "Kontaktide nimekirja sortimise alus"
 
-msgid "Enable spell checker"
-msgstr "Õigekirjakontrolli lubamine"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Kontaktide nimekirja sortimise alus. Vaikimisi väärtus on \"state\", sel "
+"juhul sorditakse kontaktid oleku järgi. Väärtuse \"name\" korral toimub "
+"sortimine nime järgi."
 
-msgid "Hide main window"
-msgstr "Peida peaaken"
+msgid "Use notification sounds"
+msgstr "Teatehelisid esitatakse"
 
-msgid "Hide the main window."
-msgstr "Peaakna peitmine."
+msgid "Whether to play a sound to notify of events."
+msgstr "Kas esitada heli sündmustest märkuandmiseks."
 
-msgid "Last account selected in Join Room dialog"
-msgstr "Viimane konto, mis valiti \"Ãœhine jututoaga\" dialoogis"
+msgid "Disable sounds when away"
+msgstr "Heliteated on minu eemaloleku korral keelatud"
 
-msgid "Nick completed character"
-msgstr "Nimele lisamise märk"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Kas esitada heli eemal või hõivatud oleku määramisest märkuandmiseks."
 
-msgid "Open new chats in separate windows"
-msgstr "Uued jututoad avatakse eraldi akendes"
+msgid "Play a sound for incoming messages"
+msgstr "Sissetulevate sõnumite puhul esitatakse heli"
 
-msgid "Path of the Adium theme to use"
-msgstr "Kasutatava Adiumi kujunduse asukoht"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Kas esitada heli saabuvatest sõnumitest märkuandmiseks."
 
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Kasutatava Adiumi kujunduse asukoht, kui vestluse kujundus on Adium."
+msgid "Play a sound for outgoing messages"
+msgstr "Väljuvate sõnumite puhul esitatakse heli"
 
-msgid "Play a sound for incoming messages"
-msgstr "Sissetulevate sõnumite puhul esitatakse heli"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Kas esitada heli väljuvatest sõnumitest märkuandmiseks."
 
 msgid "Play a sound for new conversations"
 msgstr "Uute vestluste puhul esitatakse heli"
 
-msgid "Play a sound for outgoing messages"
-msgstr "Väljuvate sõnumite puhul esitatakse heli"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Kas esitada heli uutest vestlustest märkuandmiseks."
 
 msgid "Play a sound when a contact logs in"
 msgstr "Kontakti sisenemise puhul esitatakse heli"
 
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Kas esitada heli kontakti sisenemisest märkuandmiseks."
+
 msgid "Play a sound when a contact logs out"
 msgstr "Kontakti väljumise puhul esitatakse heli"
 
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Kas esitada heli kontakti väljumisest märkuandmiseks."
+
 msgid "Play a sound when we log in"
 msgstr "Heli esitamine sisselogimisel"
 
+msgid "Whether to play a sound when logging into a network."
+msgstr "Kas esitada heli võrku sisselogimisest märkuandmiseks."
+
 msgid "Play a sound when we log out"
 msgstr "Heli esitamine väljalogimisel"
 
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Kas esitada heli võrgust väljumisest märkuandmiseks."
+
+msgid "Enable popup notifications for new messages"
+msgstr "Uute sõnumite hüpikmärguanded on lubatud"
+
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Kas näidata hüpikteadet uue teate vastuvõtmisest märkuandmiseks."
+
+msgid "Disable popup notifications when away"
+msgstr "Eemalolekul on hüpikmärguanded keelatud"
+
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Kas näidata hüpikteateid olles eemal või hõivatud."
+
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Kui vestlus pole aktiivne, näidatakse hüpikteateid"
 
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Kas näidata hüpikteadet uue sõnumi saamisest märkuandmiseks isegi siis, kui "
+"vestlus on juba avatud, kuid mitte fookuses."
+
 msgid "Pop up notifications when a contact logs in"
 msgstr "Kui kontakt siseneb, kuvatakse hüpikteade"
 
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Kas näidata hüpikteadet kontakti sisenemisest märkuandmiseks."
+
 msgid "Pop up notifications when a contact logs out"
 msgstr "Kui kontakt väljub, kuvatakse hüpikteade"
 
-msgid "Position the camera preview should be during a call."
-msgstr "Enda kaamera pildi asukoht kõne ajal."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Kas näidata hüpikteadet kontakti väljumisest märkuandmiseks."
 
-msgid "Show Balance in contact list"
-msgstr "Kontaktide nimekirjas näidatakse kontojääki"
+msgid "Use graphical smileys"
+msgstr "Tujunägudele kasutatakse pilte"
 
-msgid "Show avatars"
-msgstr "Näidatakse avatare"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Kas tujunäod tuleks teisendada vestlustes piltideks."
 
 msgid "Show contact list in rooms"
 msgstr "Jututubades näidatakse liikmete loendit"
 
-msgid "Show hint about closing the main window"
-msgstr "Peaakna sulgemise kohta näidatakse soovitust"
-
-msgid "Show offline contacts"
-msgstr "Ühendamata sõpru näidatakse"
-
-msgid "Show protocols"
-msgstr "Kuva protokolle"
-
-msgid "Spell checking languages"
-msgstr "Õigekirjakontrolli keeled"
-
-msgid "The default folder to save file transfers in."
-msgstr "Vaikimisi kataloog, kuhu salvestada vastuvõetud failid."
-
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Kataloog, kust viimati valiti avatari pilt."
-
-msgid "The position for the chat window side pane"
-msgstr "Vestlusakna külgpaneeli asukoht"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Kas jututubades näidatakse osalejate nimekirja või mitte."
 
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Vestlusakna külgpaneeli asukoht (pikslites)."
+msgid "Chat window theme"
+msgstr "Jututoaakende teema"
 
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Kujundus, mida kasutatakse jututoaakende vestluste kuvamisel."
 
+msgid "Chat window theme variant"
+msgstr "Jututoaakende teema"
+
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Kujundus, mida kasutatakse jututoaakende vestluste kuvamisel."
 
-msgid "Use graphical smileys"
-msgstr "Tujunägudele kasutatakse pilte"
-
-msgid "Use notification sounds"
-msgstr "Teatehelisid esitatakse"
-
-msgid "Use theme for chat rooms"
-msgstr "Jututubadele kasutatakse teemat"
-
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Kas Empathy võib avaldada kontaktidele kasutaja asukoha."
+msgid "Path of the Adium theme to use"
+msgstr "Kasutatava Adiumi kujunduse asukoht"
 
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Kas Empathy võib kasutada GPS-i asukoha arvamiseks."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Kasutatava Adiumi kujunduse asukoht, kui vestluse kujundus on Adium."
 
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Kas Empathy võib kasutada mobiilivõrku asukoha arvamiseks."
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit Developer tööriistade lubamine"
 
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Kas Empathy võib kasutada võrku asukoha arvamiseks."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Kas WebKit developer tööriistad, näiteks Web Inspector, tuleks lubada."
 
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Kas Empathy peaks käivitumisel ise kontodesse sisse logima."
+msgid "Inform other users when you are typing to them"
+msgstr "Vestluskaaslastele antakse teada, kui sa parasjagu kirjutad neile"
 
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Kas Empathy peaks jõudeoleku korral määrama olekuks automaatselt eemaloleku."
+"Kas saata vestlusolekuid nagu 'composing' (kirjutab) või 'paused' (peatus). "
+"Praegu ei mõjuta 'gone' (eemal) olekut."
 
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Kas Empathy peaks privaatsuse tagamiseks vähendama asukoha täpsust."
+msgid "Use theme for chat rooms"
+msgstr "Jututubadele kasutatakse teemat"
 
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Kas Empathy peaks kasutama kontakti avatari vestlusakna ikoonina."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Kas jututubadele kasutatakse kujundust või mitte."
 
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Kas WebKit developer tööriistad, näiteks Web Inspector, tuleks lubada."
+msgid "Spell checking languages"
+msgstr "Õigekirjakontrolli keeled"
 
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Kas automaatseks lahti- või taasühendumiseks tuleks kasutada ühenduste "
-"haldurit või mitte."
+"Komadega eraldatud loend õigekirjakontrolli keeltest (nt \"et, en, fi, ru\")."
+
+msgid "Enable spell checker"
+msgstr "Õigekirjakontrolli lubamine"
 
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Kas sisestatud sõnade õigsust tuleks kontrollida sinu valitud keelte järgi."
 
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Kas tujunäod tuleks teisendada vestlustes piltideks."
+msgid "Nick completed character"
+msgstr "Nimele lisamise märk"
 
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Kas lubada Pulseaudio kaja vähendamise filter."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Märk, mis lisatakse hüüdnime lõppu, kui jututoas kasutatakse nime "
+"automaatlõpetust (tab-klahv)."
 
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Kas esitada heli kontakti sisenemisest märkuandmiseks."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy peaks kasutama avatari vestlusakna ikoonina"
 
 msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Kas esitada heli kontakti väljumisest märkuandmiseks."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Kas Empathy peaks kasutama kontakti avatari vestlusakna ikoonina."
 
-msgid "Whether to play a sound to notify of events."
-msgstr "Kas esitada heli sündmustest märkuandmiseks."
+msgid "Last account selected in Join Room dialog"
+msgstr "Viimane konto, mis valiti \"Ãœhine jututoaga\" dialoogis"
 
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Kas esitada heli saabuvatest sõnumitest märkuandmiseks."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Toaga ühinemiseks viimati valitud konto D-Busi objekti asukoht"
 
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Kas esitada heli uutest vestlustest märkuandmiseks."
+msgid "Camera device"
+msgstr "Kaameraseade"
 
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Kas esitada heli väljuvatest sõnumitest märkuandmiseks."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Vaikimisi kaameraseade, mida kasutatakse videokõnede jaoks, nt /dev/video0"
 
-msgid "Whether to play a sound when logging into a network."
-msgstr "Kas esitada heli võrku sisselogimisest märkuandmiseks."
+msgid "Camera position"
+msgstr "Kaamera asukoht"
 
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Kas esitada heli võrgust väljumisest märkuandmiseks."
+msgid "Position the camera preview should be during a call."
+msgstr "Enda kaamera pildi asukoht kõne ajal."
 
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Kas esitada heli eemal või hõivatud oleku määramisest märkuandmiseks."
+msgid "Echo cancellation support"
+msgstr "Kaja vähendamise tugi"
 
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Kas näidata hüpikteadet kontakti väljumisest märkuandmiseks."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Kas lubada Pulseaudio kaja vähendamise filter."
 
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Kas näidata hüpikteadet kontakti sisenemisest märkuandmiseks."
+msgid "Show hint about closing the main window"
+msgstr "Peaakna sulgemise kohta näidatakse soovitust"
 
 msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Kas näidata hüpikteadet uue sõnumi saamisest märkuandmiseks isegi siis, kui "
-"vestlus on juba avatud, kuid mitte fookuses."
-
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Kas näidata hüpikteadet uue teate vastuvõtmisest märkuandmiseks."
+"Kas peaakna sulgemisel tiitliriba 'x' ristist küsitakse kinnitust või mitte."
 
-msgid "Whether to show account balances in the contact list."
-msgstr "Kas näidata kontaktide nimekirjas kontojääki."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy tohib näidata kasutaja asukohta"
 
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Kas näidata kontaktide nimekirjas ja vestlusakendes avatare."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Kas Empathy võib avaldada kontaktidele kasutaja asukoha."
 
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Kas näidata kontaktide nimekirjas kontakte, kes pole ühendatud."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy tohib kasutada võrku asukoha arvamiseks"
 
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Kas näidata hüpikteateid olles eemal või hõivatud."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Kas Empathy võib kasutada võrku asukoha arvamiseks."
 
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Kas näidata kontaktide nimekirjas kontaktide protokolle."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy tohib kasutada mobiilivõrku asukoha arvamiseks"
 
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Kas jututubades näidatakse osalejate nimekirja või mitte."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Kas Empathy võib kasutada mobiilivõrku asukoha arvamiseks."
 
-msgid "Whether to show the contact list in compact mode."
-msgstr "Kas kontaktide nimekirja kuvatakse kompaktvaates või mitte."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy tohib kasutada GPS-i andmeid asukoha arvamiseks"
 
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Kas peaakna sulgemisel tiitliriba 'x' ristist küsitakse kinnitust või mitte."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Kas Empathy võib kasutada GPS-i asukoha arvamiseks."
 
-msgid "Whether to use the theme for chat rooms."
-msgstr "Kas jututubadele kasutatakse kujundust või mitte."
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy peaks vähendama asukoha täpsust"
 
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"Kontaktide nimekirja sortimise alus. Vaikimisi on väärtus \"name\" ja sel "
-"juhul sorditakse kontaktid nime järgi. Väärtuse \"state\" korral toimub "
-"sortimine oleku järgi."
-
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Sõnumi- ja VoIP kontode haldamine"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Kas Empathy peaks privaatsuse tagamiseks vähendama asukoha täpsust."
 
 #. Tweak the dialog
 msgid "Messaging and VoIP Accounts"
 msgstr "Sõnumi- ja VoIP kontod"
 
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Sõnumi- ja VoIP kontode haldamine"
+
 msgid "No reason was specified"
 msgstr "Põhjendust pole määratud."
 
@@ -505,8 +521,8 @@ msgstr "Ühendust pole võimalik luua"
 msgid "Connection has been lost"
 msgstr "Ãœhendus on katkenud"
 
-msgid "This resource is already connected to the server"
-msgstr "See ressurss on juba serverisse ühendunud"
+msgid "This account is already connected to the server"
+msgstr "Selle kontoga on juba serverisse ühendutud"
 
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
@@ -537,6 +553,9 @@ msgstr ""
 msgid "Your software is too old"
 msgstr "Sinu tarkvara on liiga vana"
 
+msgid "Internal error"
+msgstr "Sisemine viga"
+
 msgid "People Nearby"
 msgstr "Lähedalasuvad inimesed"
 
@@ -640,30 +659,18 @@ msgstr "%s konto"
 msgid "New account"
 msgstr "Uus konto"
 
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Näide:</b> MinuEkraaniNimi"
-
-msgid "Advanced"
-msgstr "Laiendatud"
-
 msgid "Pass_word:"
 msgstr "_Parool:"
 
-msgid "Remember Password"
-msgstr "Parooli peetakse meeles"
-
-#. remember password ticky box
-msgid "Remember password"
-msgstr "Parooli peetakse meeles"
-
 msgid "Screen _Name:"
 msgstr "Ekraani_nimi:"
 
-msgid "What is your AIM password?"
-msgstr "Mis on sinu AIM-i parool?"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Näide:</b> MinuEkraaniNimi"
 
-msgid "What is your AIM screen name?"
-msgstr "Mis on sinu AIM-i ekraaninimi?"
+#. remember password ticky box
+msgid "Remember password"
+msgstr "Parooli peetakse meeles"
 
 msgid "_Port:"
 msgstr "_Port:"
@@ -671,27 +678,39 @@ msgstr "_Port:"
 msgid "_Server:"
 msgstr "_Server:"
 
-msgid "<b>Example:</b> username"
-msgstr "<b>Näide:</b> kasutajanimi"
+msgid "Advanced"
+msgstr "Laiendatud"
+
+msgid "What is your AIM screen name?"
+msgstr "Mis on sinu AIM-i ekraaninimi?"
+
+msgid "What is your AIM password?"
+msgstr "Mis on sinu AIM-i parool?"
+
+msgid "Remember Password"
+msgstr "Parooli peetakse meeles"
 
 msgid "Login I_D:"
 msgstr "Sisselogimise I_D:"
 
+msgid "<b>Example:</b> username"
+msgstr "<b>Näide:</b> kasutajanimi"
+
 msgid "What is your GroupWise User ID?"
 msgstr "Mis on sinu GroupWise kasutaja ID?"
 
 msgid "What is your GroupWise password?"
 msgstr "Mis on sinu GroupWise parool?"
 
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Näide:</b> 123456789"
 
 msgid "Ch_aracter set:"
 msgstr "_Kooditabel:"
 
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
 msgid "What is your ICQ UIN?"
 msgstr "Mis on sinu ICQ UIN?"
 
@@ -723,9 +742,18 @@ msgstr "Valikud"
 msgid "None"
 msgstr "Puudub"
 
+msgid "Network"
+msgstr "Võrk"
+
+msgid "Network:"
+msgstr "Võrk:"
+
 msgid "Character set:"
 msgstr "Kooditabel:"
 
+msgid "Servers"
+msgstr "Serverid"
+
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -733,12 +761,6 @@ msgstr ""
 "Enamik IRC servereid ei vaja parooli. Kui sa pole kindel, ära sisesta "
 "parooli."
 
-msgid "Network"
-msgstr "Võrk"
-
-msgid "Network:"
-msgstr "Võrk:"
-
 msgid "Nickname:"
 msgstr "Hüüdnimi:"
 
@@ -751,35 +773,14 @@ msgstr "Lahkumise teade:"
 msgid "Real name:"
 msgstr "Pärisnimi:"
 
-msgid "Servers"
-msgstr "Serverid"
-
-msgid "What is your IRC nickname?"
-msgstr "Mis on sinu IRC ekraaninimi?"
-
 msgid "Which IRC network?"
 msgstr "Milline IRC võrk?"
 
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Näide:</b> kasutaja@gmail.com"
-
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Näide:</b> kasutaja@jabber.org"
-
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Krüpteeringu nõudmine (TLS/SSL)"
-
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL-sertifikaadi vigu _eiratakse"
-
-msgid "Override server settings"
-msgstr "Serveri sätete eiramine"
-
-msgid "Priori_ty:"
-msgstr "_Tähtsus:"
+msgid "What is your IRC nickname?"
+msgstr "Mis on sinu IRC ekraaninimi?"
 
-msgid "Reso_urce:"
-msgstr "_Vahend:"
+msgid "What is your Facebook username?"
+msgstr "Mis on sinu Facebooki kasutajanimi?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
 msgid ""
@@ -793,30 +794,48 @@ msgstr ""
 "Kui sul veel ei ole Facebooki kasutajanime, saad selle luua <a href=\"http://"
 "www.facebook.com/username/\">siin lehel</a>."
 
-msgid "Use old SS_L"
-msgstr "Kasutatakse _vana SSL-i"
-
 msgid "What is your Facebook password?"
 msgstr "Mis on sinu Facebooki parool?"
 
-msgid "What is your Facebook username?"
-msgstr "Mis on sinu Facebooki kasutajanimi?"
-
 msgid "What is your Google ID?"
 msgstr "Mis on sinu Google ID?"
 
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Näide:</b> kasutaja@gmail.com"
+
 msgid "What is your Google password?"
 msgstr "Mis on sinu Google parool?"
 
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Näide:</b> kasutaja@jabber.org"
+
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL-sertifikaadi vigu _eiratakse"
+
+msgid "Priori_ty:"
+msgstr "_Tähtsus:"
+
+msgid "Reso_urce:"
+msgstr "_Vahend:"
+
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Krüpteeringu nõudmine (TLS/SSL)"
+
+msgid "Use old SS_L"
+msgstr "Kasutatakse _vana SSL-i"
+
+msgid "Override server settings"
+msgstr "Serveri sätete eiramine"
+
 msgid "What is your Jabber ID?"
 msgstr "Mis on sinu Jabberi ID?"
 
-msgid "What is your Jabber password?"
-msgstr "Mis on sinu Jabberi parool?"
-
 msgid "What is your desired Jabber ID?"
 msgstr "Mis on sinu poolt eelistatav Jabberi ID?"
 
+msgid "What is your Jabber password?"
+msgstr "Mis on sinu Jabberi parool?"
+
 msgid "What is your desired Jabber password?"
 msgstr "Mis on sinu poolt eelistatav Jabberi parool?"
 
@@ -829,99 +848,99 @@ msgstr "Mis on sinu Windows Live ID?"
 msgid "What is your Windows Live password?"
 msgstr "Mis on sinu Windows Live parool?"
 
-msgid "E-_mail address:"
-msgstr "_Meiliaadress:"
-
 msgid "Nic_kname:"
 msgstr "_Hüüdnimi:"
 
+msgid "_Last Name:"
+msgstr "_Perekonnanimi:"
+
 msgid "_First Name:"
 msgstr "_Eesnimi:"
 
+msgid "_Published Name:"
+msgstr "_Avaldatud nimi:"
+
 msgid "_Jabber ID:"
 msgstr "_Jabberi ID:"
 
-msgid "_Last Name:"
-msgstr "_Perekonnanimi:"
+msgid "E-_mail address:"
+msgstr "_Meiliaadress:"
 
-msgid "_Published Name:"
-msgstr "_Avaldatud nimi:"
+msgid "_Username:"
+msgstr "_Kasutajanimi:"
 
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Näide:</b> kasutaja@minu.sip.server"
 
-msgid "Authentication username:"
-msgstr "Autentimise kasutajanimi:"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Seda kontot kasutatakse _fiksvõrku ja mobiiltelefonidele helistamiseks"
 
-msgid "Discover Binding"
-msgstr "Seonduse avastamine"
+msgid "NAT Traversal Options"
+msgstr "NAT-traversal valikud"
+
+msgid "Proxy Options"
+msgstr "Proksi valikud"
+
+msgid "Miscellaneous Options"
+msgstr "Muud valikud"
+
+msgid "STUN Server:"
+msgstr "STUN server:"
 
 msgid "Discover the STUN server automatically"
 msgstr "STUN-serveri automaatne tuvastus"
 
-msgid "Ignore TLS Errors"
-msgstr "TLS vigasid eiratakse"
+msgid "Discover Binding"
+msgstr "Seonduse avastamine"
 
-msgid "Interval (seconds)"
-msgstr "Intervall (sekundites)"
+msgid "Server:"
+msgstr "Server:"
 
 msgid "Keep-Alive Options"
 msgstr "Ãœhenduse elushoidmise valikud"
 
-msgid "Loose Routing"
-msgstr "Vaba marsruutimine"
-
 msgid "Mechanism:"
 msgstr "Mehhanism:"
 
-msgid "Miscellaneous Options"
-msgstr "Muud valikud"
-
-msgid "NAT Traversal Options"
-msgstr "NAT-traversal valikud"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "Proxy Options"
-msgstr "Proksi valikud"
-
-msgid "STUN Server:"
-msgstr "STUN server:"
+msgid "Interval (seconds)"
+msgstr "Intervall (sekundites)"
 
-msgid "Server:"
-msgstr "Server:"
+msgid "Authentication username:"
+msgstr "Autentimise kasutajanimi:"
 
 msgid "Transport:"
 msgstr "Transport:"
 
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Seda kontot kasutatakse _fiksvõrku ja mobiiltelefonidele helistamiseks"
+msgid "Loose Routing"
+msgstr "Vaba marsruutimine"
 
-msgid "What is your SIP account password?"
-msgstr "Mis on sinu SIP-konto parool?"
+msgid "Ignore TLS Errors"
+msgstr "TLS vigasid eiratakse"
+
+msgid "Port:"
+msgstr "Port:"
 
 msgid "What is your SIP login ID?"
 msgstr "Mis on sinu SIP-i sisselogimise ID?"
 
-msgid "_Username:"
-msgstr "_Kasutajanimi:"
+msgid "What is your SIP account password?"
+msgstr "Mis on sinu SIP-konto parool?"
+
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
 
 msgid "I_gnore conference and chat room invitations"
 msgstr "Konverentside ja jututubade kutseid _eiratakse"
 
+msgid "_Room List locale:"
+msgstr "_Tubade nimekirja lokaat:"
+
 msgid "What is your Yahoo! ID?"
 msgstr "Mis on sinu Yahoo! ID?"
 
 msgid "What is your Yahoo! password?"
 msgstr "Mis on sinu Yahoo! parool?"
 
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-msgid "_Room List locale:"
-msgstr "_Tubade nimekirja lokaat:"
-
 msgid "Couldn't convert image"
 msgstr "Pole võimalik pilti teisendada"
 
@@ -1086,6 +1105,11 @@ msgstr "Teema:"
 msgid "Topic set to: %s"
 msgstr "Teema on: %s"
 
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s määras uue teema: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
 msgid "No topic defined"
 msgstr "Teemat pole seatud"
 
@@ -1246,9 +1270,6 @@ msgstr "_Ava link"
 msgid "%A %B %d %Y"
 msgstr "%A, %d. %B %Y"
 
-msgid "Personal Information"
-msgstr "Isiklikud andmed"
-
 msgid "New Contact"
 msgstr "Uus kontakt"
 
@@ -1270,15 +1291,15 @@ msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Teata sellest kuritarvitavast kasutajast"
 msgstr[1] "_Teata nendest kuritarvitavatest kasutajatest"
 
-msgid "Decide _Later"
-msgstr "Otsusta _hiljem"
-
 msgid "Subscription Request"
 msgstr "Tellimuse päring"
 
 msgid "_Block User"
 msgstr "_Blokeeri kasutaja"
 
+msgid "Decide _Later"
+msgstr "Otsusta _hiljem"
+
 #. Title
 msgid "Search contacts"
 msgstr "Kontaktide otsimine"
@@ -1390,6 +1411,12 @@ msgstr "Avatari salvestamine"
 msgid "Unable to save avatar"
 msgstr "Avatari salvestamine pole võimalik"
 
+msgid "Personal Details"
+msgstr "Isiklikud andmed"
+
+msgid "Contact Details"
+msgstr "Kontaktandmed"
+
 msgid "Full name"
 msgstr "Täisnimi"
 
@@ -1440,36 +1467,33 @@ msgstr "postipakk"
 msgid "parcel"
 msgstr "kullerpakk"
 
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Asukoht</b> kuupäeval\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+msgid "Identifier:"
+msgstr "Kasutajanimi:"
 
 #. Alias
 msgid "Alias:"
 msgstr "Alias:"
 
-msgid "Client Information"
-msgstr "Kliendi andmed"
-
-msgid "Client:"
-msgstr "Klient:"
-
-msgid "Contact Details"
-msgstr "Kontaktandmed"
-
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
-msgid "Identifier:"
-msgstr "Kasutajanimi:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Asukoht</b> kuupäeval\t"
 
 msgid "Information requested…"
 msgstr "Päriti andmeid…"
 
+msgid "Client Information"
+msgstr "Kliendi andmed"
+
 msgid "OS:"
 msgstr "OS:"
 
 msgid "Version:"
 msgstr "Versioon:"
 
+msgid "Client:"
+msgstr "Klient:"
+
 msgid "Groups"
 msgstr "Grupid"
 
@@ -1503,19 +1527,6 @@ msgstr[1] "Järgnevaid isikuid pole võimalik blokkida:"
 msgid "Edit Contact Information"
 msgstr "Kontakti andmete redigeerimine"
 
-#. Translators: the heading at the top of the Information dialogue
-msgid "Linked Contacts"
-msgstr "Liidetud kontaktid"
-
-msgid "Select contacts to link"
-msgstr "Vali kontaktid, keda kokku liita"
-
-msgid "New contact preview"
-msgstr "Uue kontakti eelvaade"
-
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Vasakul nimekirjas olevad kontaktid liidetakse kokku."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
@@ -1571,6 +1582,12 @@ msgstr "Jaga minu töölauda"
 msgid "Favorite"
 msgstr "Lemmik"
 
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts pole paigaldatud"
+
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Kontakti andmete kuvamiseks paigalda palun gnome-contacts."
+
 msgid "Infor_mation"
 msgstr "_Andmed"
 
@@ -1578,12 +1595,6 @@ msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Redaktor"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Ühenda kontaktid…"
-
 msgid "Inviting you to this room"
 msgstr "Kutse sellesse tuppa"
 
@@ -1653,42 +1664,6 @@ msgstr "uus server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-msgid "Link Contacts"
-msgstr "Kontaktide ühendamine"
-
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Eralda kontaktid…"
-
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Lingitud kontakti lahutamine seda moodustavateks kontaktideks."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-msgid "_Link"
-msgstr "_Ãœhenda"
-
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Kas lahutada lingitud kontakt '%s' osadeks?"
-
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Kas sa oled kindel, et tahad need lingitud kontakti eraldada? Sellega muutub "
-"lingitud kontakt jälle eraldi kontaktideks."
-
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Eralda"
-
 msgid "History"
 msgstr "Ajalugu"
 
@@ -1789,11 +1764,11 @@ msgstr "Puhasta kõik"
 msgid "Delete from:"
 msgstr "Kustuta kust:"
 
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Laadimine...</span>"
+msgid "_File"
+msgstr "_Fail"
 
-msgid "Chat"
-msgstr "Vestlus"
+msgid "_Edit"
+msgstr "_Redaktor"
 
 msgid "Delete All History..."
 msgstr "Kogu ajaloo kustutamine..."
@@ -1801,18 +1776,18 @@ msgstr "Kogu ajaloo kustutamine..."
 msgid "Profile"
 msgstr "Profiil"
 
+msgid "Chat"
+msgstr "Vestlus"
+
 msgid "Video"
 msgstr "Video"
 
-msgid "_Edit"
-msgstr "_Redaktor"
-
-msgid "_File"
-msgstr "_Fail"
-
 msgid "page 2"
 msgstr "leht 2"
 
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Laadimine...</span>"
+
 msgid "The contact is offline"
 msgstr "Kontakt pole võrku ühendatud"
 
@@ -1913,18 +1888,18 @@ msgstr "Uus %s konto"
 msgid "Find:"
 msgstr "Otsi:"
 
+msgid "_Previous"
+msgstr "_Eelmine"
+
+msgid "_Next"
+msgstr "_Järgmine"
+
 msgid "Mat_ch case"
 msgstr "_Tõstutundlik"
 
 msgid "Phrase not found"
 msgstr "Fraasi ei leitud"
 
-msgid "_Next"
-msgstr "_Järgmine"
-
-msgid "_Previous"
-msgstr "_Eelmine"
-
 msgid "Received an instant message"
 msgstr "Võeti vastu välksõnum"
 
@@ -2019,8 +1994,11 @@ msgstr "Oodatud hostinimi: %s"
 msgid "Certificate hostname: %s"
 msgstr "Sertifikaadi hostinimi: %s"
 
-msgid "Continue"
-msgstr "Jätka"
+msgid "C_ontinue"
+msgstr "_Jätka"
+
+msgid "Untrusted connection"
+msgstr "Ebausaldusväärne ühendus"
 
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ühendus pole usaldusväärne. Kas tahad siiski jätkata?"
@@ -2411,11 +2389,8 @@ msgstr ""
 msgid "Add…"
 msgstr "Lisa…"
 
-msgid "Loading account information"
-msgstr "Konto andmete laadimine"
-
-msgid "No protocol installed"
-msgstr "Ãœhtegi protokolli pole paigaldatud"
+msgid "_Import…"
+msgstr "_Impordi…"
 
 msgid "Protocol:"
 msgstr "Protokoll:"
@@ -2427,8 +2402,11 @@ msgstr ""
 "Uue konto lisamiseks pead paigaldama tugiprogrammi iga protokolli jaoks, "
 "mida tahad kasutada."
 
-msgid "_Import…"
-msgstr "_Impordi…"
+msgid "No protocol installed"
+msgstr "Ãœhtegi protokolli pole paigaldatud"
+
+msgid "Loading account information"
+msgstr "Konto andmete laadimine"
 
 msgid " - Empathy authentication client"
 msgstr " - Empathy autentimisklient"
@@ -2564,47 +2542,50 @@ msgstr "Helivoogu pole võimalik alustada"
 msgid "Can't establish video stream"
 msgstr "Videovoogu pole võimalik alustada"
 
-msgid "Audio"
-msgstr "Audio"
+msgid "_Call"
+msgstr "_Helista"
 
-msgid "Decoding Codec:"
-msgstr "Dekodeeriv koodek:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
-msgid "Disable camera"
-msgstr "Keela kaamera"
+msgid "_Camera"
+msgstr "_Kaamera"
 
-msgid "Display the dialpad"
-msgstr "Kuva sõrmlaud"
+msgid "_Settings"
+msgstr "_Seaded"
 
-msgid "Encoding Codec:"
-msgstr "Kodeeriv koodek:"
+msgid "_View"
+msgstr "_Vaade"
 
-msgid "Hang up"
-msgstr "Toru hargile"
+msgid "_Help"
+msgstr "A_bi"
 
-msgid "Hang up current call"
-msgstr "Praeguse kõne lõpetamine"
+msgid "_Contents"
+msgstr "_Sisukord"
 
-msgid "Local Candidate:"
-msgstr "Kohalik kandidaat:"
+msgid "_Debug"
+msgstr "Si_lumine"
 
-msgid "Maximise me"
-msgstr "Maksimeeri mind"
+msgid "Swap camera"
+msgstr "Kaamera vahetamine"
 
 msgid "Minimise me"
 msgstr "Minimeeri mind"
 
-msgid "Remote Candidate:"
-msgstr "Kaugkandidaat:"
+msgid "Maximise me"
+msgstr "Maksimeeri mind"
 
-msgid "Send Audio"
-msgstr "Saada heli"
+msgid "Disable camera"
+msgstr "Keela kaamera"
 
-msgid "Send Video"
-msgstr "Video saatmine"
+msgid "Hang up"
+msgstr "Toru hargile"
 
-msgid "Show dialpad"
-msgstr "Sõrmlaua näitamine"
+msgid "Hang up current call"
+msgstr "Praeguse kõne lõpetamine"
+
+msgid "Video call"
+msgstr "Videokõne"
 
 msgid "Start a video call"
 msgstr "Videokõne alustamine"
@@ -2612,44 +2593,81 @@ msgstr "Videokõne alustamine"
 msgid "Start an audio call"
 msgstr "Audiokõne alustamine"
 
-msgid "Swap camera"
-msgstr "Kaamera vahetamine"
+msgid "Show dialpad"
+msgstr "Sõrmlaua näitamine"
 
-msgid "Toggle audio transmission"
-msgstr "Heliedastuse lüliti"
+msgid "Display the dialpad"
+msgstr "Kuva sõrmlaud"
+
+msgid "Send Video"
+msgstr "Video saatmine"
 
 msgid "Toggle video transmission"
 msgstr "Videoedastuse lüliti"
 
+msgid "Send Audio"
+msgstr "Saada heli"
+
+msgid "Toggle audio transmission"
+msgstr "Heliedastuse lüliti"
+
+msgid "Encoding Codec:"
+msgstr "Kodeeriv koodek:"
+
 msgid "Unknown"
 msgstr "Tundmatu"
 
-msgid "Video call"
-msgstr "Videokõne"
+msgid "Decoding Codec:"
+msgstr "Dekodeeriv koodek:"
 
-msgid "_Call"
-msgstr "_Helista"
+msgid "Remote Candidate:"
+msgstr "Kaugkandidaat:"
 
-msgid "_Camera"
-msgstr "_Kaamera"
+msgid "Local Candidate:"
+msgstr "Kohalik kandidaat:"
 
-msgid "_Contents"
-msgstr "_Sisukord"
+msgid "Audio"
+msgstr "Audio"
 
-msgid "_Debug"
-msgstr "Si_lumine"
+msgid "Close this window?"
+msgstr "Kas sulgeda see aken?"
 
-msgid "_Help"
-msgstr "A_bi"
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Selle akna sulgemisega lahkud %s võrgust. Kuni uuesti ühendumiseni ei saa sa "
+"ühtegi teadet."
 
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Selle akna sulgemisega lahkud jututoast. Kuni uuesti ühendumiseni ei saa sa "
+"ühtegi teadet."
+msgstr[1] ""
+"Selle akna sulgemisega lahkud %u jututoast. Kuni uuesti ühendumiseni ei saa "
+"sa ühtegi teadet."
+
+#, c-format
+msgid "Leave %s?"
+msgstr "Kas lahkuda toast %s?"
 
-msgid "_Settings"
-msgstr "_Seaded"
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "Kuni uuesti ühendumiseni ei saa sa sellest jututoast ühtegi teadet."
 
-msgid "_View"
-msgstr "_Vaade"
+msgid "Close window"
+msgstr "Sulge aken"
+
+msgid "Leave room"
+msgstr "Lahku toast"
 
 #, c-format
 msgid "%s (%d unread)"
@@ -2687,51 +2705,51 @@ msgstr[1] "%d sõnumi saatmine"
 msgid "Typing a message."
 msgstr "Kirjutab sõnumit."
 
+msgid "_Conversation"
+msgstr "_Vestlus"
+
 msgid "C_lear"
 msgstr "_Puhasta"
 
-msgid "C_ontact"
-msgstr "_Kontakt"
-
 msgid "Insert _Smiley"
 msgstr "Lisa _tujunägu"
 
-msgid "Invite _Participant…"
-msgstr "Kutsu _osaline…"
-
-msgid "Move Tab _Left"
-msgstr "Tõsta kaart _vasakule"
-
-msgid "Move Tab _Right"
-msgstr "Tõsta kaart _paremale"
+msgid "_Favorite Chat Room"
+msgstr "_Lemmikjututuba"
 
 msgid "Notify for All Messages"
 msgstr "Teavitamine kõigist sõnumitest"
 
-msgid "_Conversation"
-msgstr "_Vestlus"
+msgid "_Show Contact List"
+msgstr "_Sõbranimekirja näidatakse"
 
-msgid "_Detach Tab"
-msgstr "_Haagi kaart lahti"
+msgid "Invite _Participant…"
+msgstr "Kutsu _osaline…"
 
-msgid "_Favorite Chat Room"
-msgstr "_Lemmikjututuba"
+msgid "C_ontact"
+msgstr "_Kontakt"
 
-msgid "_Next Tab"
-msgstr "_Järgmine kaart"
+msgid "_Tabs"
+msgstr "_Sakid"
 
 msgid "_Previous Tab"
 msgstr "_Eelmine kaart"
 
-msgid "_Show Contact List"
-msgstr "_Sõbranimekirja näidatakse"
-
-msgid "_Tabs"
-msgstr "_Sakid"
+msgid "_Next Tab"
+msgstr "_Järgmine kaart"
 
 msgid "_Undo Close Tab"
 msgstr "_Võta saki sulgemine tagasi"
 
+msgid "Move Tab _Left"
+msgstr "Tõsta kaart _vasakule"
+
+msgid "Move Tab _Right"
+msgstr "Tõsta kaart _paremale"
+
+msgid "_Detach Tab"
+msgstr "_Haagi kaart lahti"
+
 msgid "Name"
 msgstr "Nimi"
 
@@ -2934,6 +2952,9 @@ msgstr "Parooli sisestamine"
 msgid "Disconnect"
 msgstr "Katkesta ühendus"
 
+msgid "You need to setup an account to see contacts here."
+msgstr "Siin kontaktide nägemiseks pead mõne konto seadistama."
+
 msgid "No match found"
 msgstr "Vastavust ei leitud"
 
@@ -2956,7 +2977,7 @@ msgid "Edit Account"
 msgstr "Konto redigeerimine"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
+#. * Top up My Account ($1.23)..."
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Lae %s kontot (%s)..."
@@ -2971,38 +2992,55 @@ msgstr "Lae kontot..."
 msgid "Contact"
 msgstr "Kontakt"
 
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Siin kontaktide nägemiseks pead lubama vähemalt ühe oma kontodest."
+
+#. translators: argument is an account name
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Pead lubama %s konto, et näha siin kontakte."
+
 msgid "Contact List"
 msgstr "Kontaktide nimekiri"
 
-msgid "Contacts on a _Map"
-msgstr "Kontaktid _kaardil"
+msgid "Account settings"
+msgstr "Konto sätted"
 
-msgid "Credit Balance"
-msgstr "Kontojääk"
+msgid "_New Conversation…"
+msgstr "_Uus vestlus…"
 
-msgid "Find in Contact _List"
-msgstr "_Otsi kontaktide nimekirjast"
+msgid "New _Call…"
+msgstr "Uus _kõne…"
 
-msgid "Join _Favorites"
-msgstr "Ãœhine _lemmiktubadega"
+msgid "_Search for Contacts…"
+msgstr "_Otsi kontakte…"
 
-msgid "Manage Favorites"
-msgstr "Lemmiktubade haldamine"
+msgid "_File Transfers"
+msgstr "_Failiülekanded"
 
-msgid "N_ormal Size"
-msgstr "No_rmaalsuurus"
+msgid "_Offline Contacts"
+msgstr "Ü_hendamata kontaktid"
 
-msgid "New _Call…"
-msgstr "Uus _kõne…"
+msgid "Show P_rotocols"
+msgstr "Kuva _protokolle"
 
-msgid "Normal Size With _Avatars"
-msgstr "Normaalsuurus _avataridega"
+msgid "Credit Balance"
+msgstr "Kontojääk"
+
+msgid "Contacts on a _Map"
+msgstr "Kontaktid _kaardil"
+
+msgid "_Accounts"
+msgstr "_Kontod"
+
+msgid "_Blocked Contacts"
+msgstr "_Blokitud kontaktid"
 
 msgid "P_references"
 msgstr "_Eelistused"
 
-msgid "Show P_rotocols"
-msgstr "Kuva _protokolle"
+msgid "Find in Contact _List"
+msgstr "_Otsi kontaktide nimekirjast"
 
 msgid "Sort by _Name"
 msgstr "Sortimine _nime järgi"
@@ -3010,35 +3048,26 @@ msgstr "Sortimine _nime järgi"
 msgid "Sort by _Status"
 msgstr "Sortimine _oleku järgi"
 
-msgid "_Accounts"
-msgstr "_Kontod"
+msgid "Normal Size With _Avatars"
+msgstr "Normaalsuurus _avataridega"
 
-msgid "_Blocked Contacts"
-msgstr "_Blokitud kontaktid"
+msgid "N_ormal Size"
+msgstr "No_rmaalsuurus"
 
 msgid "_Compact Size"
 msgstr "_Kompaktne"
 
-msgid "_File Transfers"
-msgstr "_Failiülekanded"
+msgid "_Room"
+msgstr "_Tuba"
 
 msgid "_Join…"
 msgstr "Ü_hine…"
 
-msgid "_New Conversation…"
-msgstr "_Uus vestlus…"
-
-msgid "_Offline Contacts"
-msgstr "Ü_hendamata kontaktid"
-
-msgid "_Personal Information"
-msgstr "_Isiklikud andmed"
-
-msgid "_Room"
-msgstr "_Tuba"
+msgid "Join _Favorites"
+msgstr "Ãœhine _lemmiktubadega"
 
-msgid "_Search for Contacts…"
-msgstr "_Otsi kontakte…"
+msgid "Manage Favorites"
+msgstr "Lemmiktubade haldamine"
 
 msgid "Chat Room"
 msgstr "Jututuba"
@@ -3069,8 +3098,8 @@ msgstr "Tubade nimekirja pole võimalik alustada"
 msgid "Could not stop room listing"
 msgstr "Tubade nimekirja pole võimalik lõpetada"
 
-msgid "Couldn't load room list"
-msgstr "Tubade nimekirja pole võimalik laadida"
+msgid "Join Room"
+msgstr "Toaga ühinemine"
 
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
@@ -3078,6 +3107,9 @@ msgstr ""
 "Sisesta jututoa nimi, millega tahad liituda, või klõpsa loendis oleva toa "
 "nimele."
 
+msgid "_Room:"
+msgstr "_Tuba:"
+
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -3085,15 +3117,12 @@ msgstr ""
 "Sisesta server, mis võõrustab jututuba, või jäta tühjaks, kui tuba on "
 "praeguse konto serveris"
 
-msgid "Join Room"
-msgstr "Toaga ühinemine"
+msgid "Couldn't load room list"
+msgstr "Tubade nimekirja pole võimalik laadida"
 
 msgid "Room List"
 msgstr "Tubade nimekiri"
 
-msgid "_Room:"
-msgstr "_Tuba:"
-
 msgid "Message received"
 msgstr "Sõnumi vastuvõtmine"
 
@@ -3103,7 +3132,7 @@ msgstr "Sõnumi saatmine"
 msgid "New conversation"
 msgstr "Uus vestlus"
 
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Kontakti sisenemine"
 
 msgid "Contact goes offline"
@@ -3153,23 +3182,71 @@ msgstr "Julia lahkus"
 msgid "Preferences"
 msgstr "Eelistused"
 
+msgid "Show _smileys as images"
+msgstr "_Tujunägusid näidatakse piltidena"
+
+msgid "Show contact _list in rooms"
+msgstr "Jututubades näidatakse kontaktide _loendit"
+
 msgid "Appearance"
 msgstr "Välimus"
 
+msgid "Start chats in:"
+msgstr "Jututoad asuvad:"
+
+msgid "new ta_bs"
+msgstr "uutel _kaartidel"
+
+msgid "new _windows"
+msgstr "uutes _akendes"
+
+msgid "Display incoming events in the notification area"
+msgstr "Sissetulevaid sündmuseid kuvatakse teatealal"
+
+msgid "_Automatically connect on startup"
+msgstr "_Käivitumisel ühendutakse automaatselt"
+
+msgid "Log conversations"
+msgstr "Vestluseid logitakse"
+
 msgid "Behavior"
 msgstr "Käitumine"
 
-msgid "Chat Th_eme:"
-msgstr "Vestluse _teema:"
+msgid "General"
+msgstr "Ãœldine"
+
+msgid "_Enable bubble notifications"
+msgstr "_Teatemullid on lubatud"
 
 msgid "Disable notifications when _away or busy"
 msgstr "_Eemal- või hõivatud oleku korral on teated keelatud"
 
+msgid "Enable notifications when the _chat is not focused"
+msgstr "_Fokuseerimata jututoa teated on lubatud"
+
+msgid "Enable notifications when a contact comes online"
+msgstr "Teatatakse kontakti sisenemisest"
+
+msgid "Enable notifications when a contact goes offline"
+msgstr "Teatatakse kontakti väljumisest"
+
+msgid "Notifications"
+msgstr "Teavitamisviisid"
+
+msgid "_Enable sound notifications"
+msgstr "_Heliteated on lubatud"
+
 msgid "Disable sounds when _away or busy"
 msgstr "_Eemal- või hõivatud oleku korral on helid keelatud"
 
-msgid "Display incoming events in the notification area"
-msgstr "Sissetulevaid sündmuseid kuvatakse teatealal"
+msgid "Play sound for events"
+msgstr "Helisid esitatakse järgnevate sündmuste puhul"
+
+msgid "Sounds"
+msgstr "Helid"
+
+msgid "Use _echo cancellation to improve call quality"
+msgstr "_Kaja vähendamine kõne kvaliteedi parendamiseks"
 
 msgid ""
 "Echo cancellation helps to make your voice sound clearer to the other "
@@ -3182,35 +3259,8 @@ msgstr ""
 "kuuleb imelikku müra või krõpse kõne ajal, proovi kaja vähendamine välja "
 "lülitada ja helista uuesti."
 
-msgid "Enable notifications when a contact comes online"
-msgstr "Teatatakse kontakti sisenemisest"
-
-msgid "Enable notifications when a contact goes offline"
-msgstr "Teatatakse kontakti väljumisest"
-
-msgid "Enable notifications when the _chat is not focused"
-msgstr "_Fokuseerimata jututoa teated on lubatud"
-
-msgid "Enable spell checking for languages:"
-msgstr "Õigekirjakontroll on lubatud järgmistele keeltele:"
-
-msgid "General"
-msgstr "Ãœldine"
-
-msgid "Location sources:"
-msgstr "Asukohaallikad:"
-
-msgid "Log conversations"
-msgstr "Vestluseid logitakse"
-
-msgid "Notifications"
-msgstr "Teavitamisviisid"
-
-msgid "Play sound for events"
-msgstr "Helisid esitatakse järgnevate sündmuste puhul"
-
-msgid "Privacy"
-msgstr "Privaatsus"
+msgid "_Publish location to my contacts"
+msgstr "_Minu asukoht avaldatakse kontaktidele"
 
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
@@ -3220,17 +3270,24 @@ msgstr ""
 "Vähendatud asukoha täpsuse korral avaldatakse ainult linn, maakond ja riik. "
 "GPSi laius- ja pikkuskraadid ümardatakse kümnendkohani."
 
-msgid "Show _smileys as images"
-msgstr "_Tujunägusid näidatakse piltidena"
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+msgid "_Reduce location accuracy"
+msgstr "_Asukoha täpsust vähendatakse"
 
-msgid "Show contact _list in rooms"
-msgstr "Jututubades näidatakse kontaktide _loendit"
+msgid "Privacy"
+msgstr "Privaatsus"
 
-msgid "Sounds"
-msgstr "Helid"
+msgid "_GPS"
+msgstr "_GPS"
 
-msgid "Spell Checking"
-msgstr "Õigekirjakontroll"
+msgid "_Cellphone"
+msgstr "_Mobiiltelefon"
+
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Võrk (IP, Wi-Fi)"
+
+msgid "Location sources:"
+msgstr "Asukohaallikad:"
 
 msgid ""
 "The list of languages reflects only the languages for which you have a "
@@ -3239,48 +3296,41 @@ msgstr ""
 "Keelte nimekiri kajastab ainult neid keeli, mille jaoks on paigaldatud "
 "sõnastik."
 
-msgid "Themes"
-msgstr "Teemad"
+msgid "Enable spell checking for languages:"
+msgstr "Õigekirjakontroll on lubatud järgmistele keeltele:"
 
-msgid "Use _echo cancellation to improve call quality"
-msgstr "_Kaja vähendamine kõne kvaliteedi parendamiseks"
+msgid "Spell Checking"
+msgstr "Õigekirjakontroll"
+
+msgid "Chat Th_eme:"
+msgstr "Vestluse _teema:"
 
 msgid "Variant:"
 msgstr "Variant:"
 
-msgid "_Automatically connect on startup"
-msgstr "_Käivitumisel ühendutakse automaatselt"
-
-msgid "_Cellphone"
-msgstr "_Mobiiltelefon"
-
-msgid "_Enable bubble notifications"
-msgstr "_Teatemullid on lubatud"
-
-msgid "_Enable sound notifications"
-msgstr "_Heliteated on lubatud"
+msgid "Themes"
+msgstr "Teemad"
 
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Status"
+msgstr "Olek"
 
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Võrk (IP, Wi-Fi)"
+msgid "_Quit"
+msgstr "_Lõpeta"
 
-msgid "_Open new chats in separate windows"
-msgstr "_Uued vestlused avanevad eraldi akendes"
+msgid "Redial"
+msgstr "Vali uuesti"
 
-msgid "_Publish location to my contacts"
-msgstr "_Minu asukoht avaldatakse kontaktidele"
+msgid "V_ideo"
+msgstr "V_ideo"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-msgid "_Reduce location accuracy"
-msgstr "_Asukoha täpsust vähendatakse"
+msgid "Video Off"
+msgstr "Video väljas"
 
-msgid "Status"
-msgstr "Olek"
+msgid "Video Preview"
+msgstr "Video eelvaade"
 
-msgid "_Quit"
-msgstr "_Lõpeta"
+msgid "Video On"
+msgstr "Video sees"
 
 msgid "Call the contact again"
 msgstr "Helista kontaktile uuesti"
@@ -3288,35 +3338,20 @@ msgstr "Helista kontaktile uuesti"
 msgid "Camera Off"
 msgstr "Kaamera väljas"
 
-msgid "Camera On"
-msgstr "Kaamera sees"
-
 msgid "Disable camera and stop sending video"
 msgstr "Kaamera keelamine ja video saatmise lõpetamine"
 
-msgid "Enable camera and send video"
-msgstr "Kaamera lubamine ja video saatmine"
-
-msgid "Enable camera but don't send video"
-msgstr "Kaamera lubamine ilma video saatmiseta"
-
 msgid "Preview"
 msgstr "Eelvaade"
 
-msgid "Redial"
-msgstr "Vali uuesti"
-
-msgid "V_ideo"
-msgstr "V_ideo"
-
-msgid "Video Off"
-msgstr "Video väljas"
+msgid "Enable camera but don't send video"
+msgstr "Kaamera lubamine ilma video saatmiseta"
 
-msgid "Video On"
-msgstr "Video sees"
+msgid "Camera On"
+msgstr "Kaamera sees"
 
-msgid "Video Preview"
-msgstr "Video eelvaade"
+msgid "Enable camera and send video"
+msgstr "Kaamera lubamine ja video saatmine"
 
 msgid "Contact Map View"
 msgstr "Kontaktide kaardivaade"
diff --git a/po/gl.po b/po/gl.po
index 9d4404c37..c23d236b2 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 15:44+0100\n"
-"PO-Revision-Date: 2012-01-15 15:45+0100\n"
+"POT-Creation-Date: 2012-02-19 18:29+0100\n"
+"PO-Revision-Date: 2012-02-19 18:30+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
@@ -41,6 +41,16 @@ msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr ""
 "Converse en Google Talk, Facebook, MSN e moitos máis servizos de conversa"
 
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "Contas de mensaxaría e VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Xestionar as contas de mensaxaría e VoIP"
+
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Connection managers should be used"
@@ -200,91 +210,101 @@ msgstr ""
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+msgid "Show contact groups"
+msgstr "Mostrar os grupos de contactos"
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+msgid "Whether to show groups in the contact list."
+msgstr "Indica se mostrar ou non os grupos na lista de contactos."
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Contact list sort criterion"
 msgstr "Criterio de ordenación da lista de contactos"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
-"Que criterio usará ao ordenar a lista de contactos. O predeterminado é usar "
-"a ordenación polo nome do contacto co valor \"name\". Un valor de \"estado\" "
-"ordenará a lista de contactos por estado."
+"Que criterio usar ao ordenar a lista de contactos. O predeterminado é usar a "
+"ordenación polo estado co valor \"state\" (estado). Un valor de \"name"
+"\" (nome) ordenará a lista de contactos polo nome."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Use notification sounds"
 msgstr "Usar sons de notificación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Whether to play a sound to notify of events."
 msgstr "Indica se reproducir ou non un son para notificar os eventos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Disable sounds when away"
 msgstr "Desactivar os sons cando se está ausente"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Indica se reproducir ou non un son para notificar cando se está ocupado ou "
 "ausente."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound for incoming messages"
 msgstr "Reproducir un son para as mensaxes entrantes"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr ""
 "Indica se reproducir ou non un son para notificar as mensaxes entrantes."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for outgoing messages"
 msgstr "Reproducir un son para as mensaxes saíntes"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Indica se reproducir ou non un son para notificar as mensaxes saíntes."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Reproducir un son para as conversas novas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Indica se reproducir ou non un son para notificar as conversas novas."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Reproducir un son cando un contacto inicia unha sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Indica se reproducir ou non un son para notificar que os contactos inician "
 "unha sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when a contact logs out"
 msgstr "Reproducir un son cando un contacto saia da sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
@@ -292,57 +312,57 @@ msgstr ""
 "unha sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Play a sound when we log in"
 msgstr "Reproducir un son cando iniciamos a sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Whether to play a sound when logging into a network."
 msgstr ""
 "Indica se reproducir ou non un son cando se inicia unha sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Play a sound when we log out"
 msgstr "Reproducir un son cando saímos da sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Indica se reproducir ou non un son cando se sae da sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Enable popup notifications for new messages"
 msgstr "Activar as notificacións emerxentes para as mensaxes novas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
 "mensaxe nova."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Disable popup notifications when away"
 msgstr "Desactivar as notificacións emerxentes cando se está ausente"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Indica se mostrar ou non as notificacións emerxentes cando se está ausente "
 "ou ocupado."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Facer emerxer unha notificación cando a conversa non está enfocada"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -351,110 +371,122 @@ msgstr ""
 "mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Pop up notifications when a contact logs in"
 msgstr "Facer emerxer unha notificación cando un contacto entra"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando un contacto está "
 "conectado."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Pop up notifications when a contact logs out"
 msgstr "Facer emerxer unha notificación cando un contacto sae"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando un contacto está "
 "desconectado."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Use graphical smileys"
 msgstr "Usar emoticonas gráficas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Indica se converter ou non as emoticonas en imaxes gráficas nas conversas."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Show contact list in rooms"
 msgstr "Mostrar a lista de contactos nas salas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Chat window theme"
 msgstr "Tema da xanela de conversa"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "O tema usado para mostrar as conversa nas xanelas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Chat window theme variant"
 msgstr "Variante do tema da xanela de charla"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 "A variante do tema que se usará para mostrar a conversa nas xanelas de chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Path of the Adium theme to use"
 msgstr "Ruta do tema de Adium para usar"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Ruta do tema de Adium para usar se o tema usado para o chat é de Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Enable WebKit Developer Tools"
 msgstr "Activar as ferramentas de desenvolvedor WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Indica se as ferramentas de desenvolvedor WebKit, tales como Web Inspector, "
 "deberían ser activadas."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Inform other users when you are typing to them"
+msgstr "Informar a outros usuarios cando vostede está escribindo"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Indica se enviar ou non os estados de conversa «escribindo» ou «pausado». No "
+"afecta realmente ao estado «ausente»."
+
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Use theme for chat rooms"
 msgstr "Usar un tema para as salas de conversa"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to use the theme for chat rooms."
 msgstr "Indica se usar ou non o tema para as salas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Spell checking languages"
 msgstr "Idiomas para a corrección ortográfica"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
@@ -462,12 +494,12 @@ msgstr ""
 "ex., «gl, pt, en»)."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Enable spell checker"
 msgstr "Activar a verificación ortográfica"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
@@ -475,12 +507,12 @@ msgstr ""
 "as quere verificar."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Nick completed character"
 msgstr "Carácter de completado de alcume"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -489,63 +521,63 @@ msgstr ""
 "alcume (tabulador) nunha conversa de grupo."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "O Empathy debería usar o avatar do contacto como a icona da xanela de "
 "conversa"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Indica se o Empathy debería usar o avatar dos contactos como a icona da "
 "xanela da conversa ou non."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Last account selected in Join Room dialog"
 msgstr "Última conta seleccionada no diálogo Unirse á sala"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
 "Ruta do obxecto D-Bus da última conta seleccionada para unirse a unha sala."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Camera device"
 msgstr "Dispositivo da cámara"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "Dispositivo de cámara predeterminado para usar nas chamadas de vídeo, p.ex. /"
 "dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Camera position"
 msgstr "Posición da cámara"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Position the camera preview should be during a call."
 msgstr ""
 "Posición onde debe estar a vista previa da cámara durante unha chamada."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Echo cancellation support"
 msgstr "Compatibilidade de cancelación de eco"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Indica se activar o filtro de cancelación de eco de Pulseaudio."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Show hint about closing the main window"
 msgstr "Mostrar unha indicación sobre pechar a xanela principal"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -553,71 +585,61 @@ msgstr ""
 "Indica se mostrar ou non o diálogo de mensaxe sobre pechar a xanela "
 "principal co botón 'x' da barra de título."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Empathy can publish the user's location"
 msgstr "Empathy pode publicar a localización dos usuarios"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Indica se o Empathy pode ou non publicar a localización do usuario aos seus "
 "contactos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy pode usar a rede para adiviñar a localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 "Indica se o Empathy pode ou non usar a rede para adiviñar a localización."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy pode usar a rede de móbiles para seguir a localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Indica se o Empathy pode ou non usar a rede de telefonía móbil para adiviñar "
 "a localización."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy pode usar o GPS para seguir a localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr ""
 "Indica se o Empathy pode usar ou non o GPS para adiviñar a localización."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Empathy should reduce the location's accuracy"
 msgstr "O Empathy debería reducir a precisión da localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Indica se o Empathy debería ou non reducir a precisión de localización por "
 "motivos de privacidade."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Contas de mensaxaría e VoIP"
-
-#: ../data/empathy-accounts.desktop.in.in.h:2
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Xestionar as contas de mensaxaría e VoIP"
-
 # rever
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -648,7 +670,7 @@ msgstr "Produciuse un erro ao tentar transferir o ficheiro"
 msgid "The other participant is unable to transfer the file"
 msgstr "O outro participante non pode transferir o ficheiro"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Motivo descoñecido"
 
@@ -685,156 +707,156 @@ msgstr "Chamou %s"
 msgid "Call from %s"
 msgstr "Chamada de %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Dispoñíbel"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisíbel"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "O estado está definido a desconectado"
 
 # rever
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
+#: ../libempathy/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 "Erro de rede"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
 # rever
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Erro de cifrado"
 
 # rever
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nome en uso"
 
 # rever
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Non se proporcionou o certificado"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certificado non fiábel"
 
 # rever
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "O certificado caducou"
 
 # rever
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "O certificado non está activado"
 
 # rever
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "O nome do host do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "A impresión dixital do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificado autoasinado"
 
 # rever
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Erro de certificado"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "O cifrado non está dispoñíbel"
 
 # rever
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "O certificado non é válido"
 
 # rever
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Rexeitouse a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Non é posíbel estabelecer a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Perdeuse a conexión"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Este recurso xa está conectado ao servidor"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Esta conta xa está conectada ao servidor"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "A conexión foi substituída por unha nova conexión empregando o mesmo recurso"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Nestes intres o servidor está moi ocupado para xesionar a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "O certificado foi revocado"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "O certificado usa un algoritmo de cifrado inseguro ou cripotograficamente "
 "débil"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -843,80 +865,84 @@ msgstr ""
 "certificado do servidor excede os límites impostos pola biblioteca de "
 "criptografía."
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "O seu software é demasiado antigo"
 
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Erro interno"
+
 # rever
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Persoas próximas"
 
 # rever
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Hai %d segundo"
 msgstr[1] "Hai %d segundos"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Hai %d minuto"
 msgstr[1] "Hai %d minutos"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Hai %d hora"
 msgstr[1] "Hai %d horas"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Hai %d día"
 msgstr[1] "Hai %d días"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Hai %d semana"
 msgstr[1] "Hai %d semanas"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Hai %d mes"
 msgstr[1] "Hai %d meses"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "no futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Tódalas contas"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Conta"
 
@@ -934,30 +960,30 @@ msgstr "Servidor"
 msgid "Port"
 msgstr "Porto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Nome de _usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "A_plicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Iniciar sesi_ón"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Crear unha nova conta no servidor"
 
@@ -967,20 +993,20 @@ msgstr "Crear unha nova conta no servidor"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s sobre %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Conta %s"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Conta nova"
 
@@ -1478,40 +1504,40 @@ msgstr "Este protocolo non admite as chamadas de emerxencia"
 msgid "You don't have enough credit in order to place this call"
 msgstr "Non ten crédito dabondo para facer esta chamada"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Produciuse un fallo ao abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Ese asunto non se admite nesta conversación"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Non se lle permite cambiar o asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "«%s» non é un ID de contacto válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear, limpa todas as mensaxes da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>, estabelece o asunto da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chatroom id>, unirse a unha nova sala de conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chatroom id>, unirse a unha nova sala de conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1519,23 +1545,23 @@ msgstr ""
 "/part [<chat room ID>] [<reason>]: abandonar a sala de char, por omisión a "
 "actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact id> [<message>], abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact id> <message>, abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>, cambia o seu nome de usuario no servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>, envía unha mensaxe ACTION á conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1545,11 +1571,11 @@ msgstr ""
 "unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
 "unirse a unha nova sala de conversa\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID do contacto>: mostra información sobre un contacto"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1557,127 +1583,134 @@ msgstr ""
 "/help [<command>], mostra todas as ordes admitidas. Se <command> está "
 "definida, mostra o seu uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Orde descoñecida"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "non ten balance suficiente para enviar a mensaxe"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Produciuse un erro ao enviar a mensaxe: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "non ten balance dabondo para enviar a mensaxe <a href='%s'>Recargar</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "non é posíbel"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "contacto incorrecto"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "a mensaxe é demasiado longa"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "non implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Asunto:"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Cambiouse o asunto a: %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Tema estabelecido por %s a: %s"
+
+# rever
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Non se definiu un asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Sen suxestións)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Engadir «%s» ao dicionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Engadir «%s» ao dicionario de %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Inserir unha emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "Suxestións de _ortografía"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Produciuse un fallo ao obter os rexistros recentes"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -1685,12 +1718,12 @@ msgstr "%s desconectou"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulsado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulsado"
@@ -1698,17 +1731,17 @@ msgstr "%s foi expulsado"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi vetado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi excluído"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s deixou a sala"
@@ -1718,18 +1751,18 @@ msgstr "%s deixou a sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s uniuse á sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s agora é coñecido como %s"
@@ -1737,55 +1770,55 @@ msgstr "%s agora é coñecido como %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../libempathy-gtk/empathy-chat.c:2993
 #: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Desexa gardar este contrasinal?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Agora non"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Reintentar"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "O contrasinal é incorrecto, ténteo de novo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protexida por un contrasinal:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Conversa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1855,34 +1888,30 @@ msgstr "_Abrir a ligazón"
 msgid "%A %B %d %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Información persoal"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Contacto novo"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Desexa bloquear a %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Ten certeza de bloquear a «%s» para que non volva a contactar con vostede?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -2061,7 +2090,7 @@ msgstr "Altitude:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Localización"
 
@@ -2089,6 +2118,18 @@ msgstr "Gardar o avatar"
 msgid "Unable to save avatar"
 msgstr "Non foi posíbel gardar o avatar"
 
+# rever
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Detalles persoais"
+
+# rever
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Detalles do contacto"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Nome completo"
@@ -2172,12 +2213,6 @@ msgstr "Alias:"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Localización</b> o (date)\t"
 
-# rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Contact Details"
-msgstr "Detalles do contacto"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
@@ -2201,11 +2236,11 @@ msgstr "Versión:"
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2213,17 +2248,17 @@ msgstr ""
 "Seleccione os grupos en que quere que aparezan estes contactos. Note que "
 "pode seleccionar máis dun grupo ou ningún."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Eng_adir grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-roster-window.c:1919
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupo"
 
@@ -2243,168 +2278,150 @@ msgstr[1] "Non é posíbel bloquear as seguintes identidades:"
 msgid "Edit Contact Information"
 msgstr "Editar a información de contacto"
 
-# rever
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Contactos ligados"
-
-# rever
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Seleccione os contactos a ligar"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Vista previa do contacto novo"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda"
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Seleccione a conta a usar para realizar a chamada"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Chamar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Móbil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Traballo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Casa"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Bloquear contacto"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
 #: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Conversa"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audiochamada"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videochamada"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
 #: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Conversas _previas"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Enviar ficheiro"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Compartir o meu escritorio"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Favorito"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts non está instalado"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Instale o programa gnome-contacts para acceder aos detalles dos contactos"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 # rever
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Ligar contactos…"
-
-# rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Invítao a vostede a esta sala"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "Conv_idar a sala de conversa"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
 #: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "Eng_adir un contacto…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Eliminar e _bloquear"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Está seguro de que quere eliminar o grupo '%s'?"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Eliminando o grupo"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "_Eliminar"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Está seguro de quere eliminar o contacto '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2413,7 +2430,7 @@ msgstr ""
 "Desexa eliminar o contacto ligado %s? Teña en conta que eliminaranse tamén "
 "todos os contactos que forman este contacto ligado."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Eliminando o contacto"
 
@@ -2458,50 +2475,6 @@ msgstr "servidor novo"
 msgid "SSL"
 msgstr "SSL"
 
-# rever
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Ligar contactos"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Desligar…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Separar por completo o contacto ligado nos contactos que contén."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Ligar"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Desexa desligar os contactos ligados «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Está seguro que quere desligar estes contactos ligados? Isto separará por "
-"completo os contactos ligados en contactos separados."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Desligar"
-
 #: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historial"
@@ -2602,7 +2575,7 @@ msgid "Text chats"
 msgstr "Conversas de texto"
 
 #: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Chamadas"
 
@@ -2878,12 +2851,12 @@ msgstr "Chamada de voz finalizada"
 msgid "Edit Custom Messages"
 msgstr "Editar mensaxes personalizadas"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensaxe editado ás %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2967,35 +2940,39 @@ msgid "Certificate hostname: %s"
 msgstr "Nome do servidor do certificado: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continuar"
+msgid "C_ontinue"
+msgstr "C_ontinuar"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "A conexión non é confianza"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "A conexión non confiábel. Desexa continuar de todas formas?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Lembrar esta elección para futuras conexións"
 
 # rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalles do certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Non foi posíbel abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Non hai espazo suficiente para gardar o ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -3004,7 +2981,7 @@ msgstr ""
 "Requírense %s de espazo libre para gardar este ficheiro, pero só hai %s "
 "dispoñíbeis. Elixa outra localización."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ficheiro entrante de %s"
@@ -3269,239 +3246,76 @@ msgstr ""
 "org>, 2009.\n"
 "Antón Méixome <meixome@mancomun.org>, 2009."
 
-# rever
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Produciuse un erro ao importar as contas."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Produciuse un erro ao procesar os detalles da conta."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Produciuse un erro ao crear a conta."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Produciuse un erro."
-
-# rever
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "A mensaxe do erro foi: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Pode ben volver atrás e tentar introducir outra vez os detalles ou saír "
-"deste asistente e engadir as contas máis tarde desde o menú Editar."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Produciuse un erro"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Que clase de conta de chat ten?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Ten algunha outra conta de chat que queira estabelecer?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Introduza os seus detalles de conta"
-
-# rever
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Que clase de conta de chat quere crear?"
-
-# rever
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Quere crear outras contas de chat?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Introduza os detalles para a nova conta"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Con Empathy pode falar en liña con persoas próximas e con amigos e colegas "
-"que usen Google Talk, AIM, Windows Live e calquera outro programa de chat. "
-"Cun micrófono ou unha cámara web tamén pode ter chamadas de audio ou vídeo."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Ten algunha outra conta que estea usando con outro programa de chat?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Si, importar os detalles da miña conta desde "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Si, introducirei os meus detalles de conta agora"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "Non, quero crear unha conta nova"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "Non, só quero ver á xente conectada que estea próxima por agora"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Seleccione as contas que quere importar:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "Si"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "Non, isto é todo por agora"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy pode descubrir automaticamente e conversar con xente conectada na "
-"mesma rede que vostede. Se quere usar esta característica, comprobe que os "
-"detalles de abaixo son correctos. Vostede pode cambiar de forma sinxela eses "
-"detalles máis tarde ou desactivar esta característica usando o diálogo "
-"\"Contas\""
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Editar->Contas"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "_Non quero activar esta característica por agora"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Vostede non poderá conversar con xente conectada á súa rede local xa que "
-"telepathy-salut non está instalado.\n"
-"Se quere activar esta característica, instale o paquete telepathy-salut e "
-"cree unha conta de Persoas próximas desde o diálogo Contas"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut non está instalado"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asistente de contas de mensaxaría e VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Benvido/a ao Empathy"
-
-# rever
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "_Importar as súas contas existentes"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Insira os detalles persoais"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:71
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Hai modificacións sen gardar respecto da súa conta %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:75
 msgid "Your new account has not been saved yet."
 msgstr "A súa nova conta aínda non foi gardada."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:347
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "Desconectado — Sen conexión de rede"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "Estado descoñecido"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
 msgstr "Desconectado — Conta desactivada"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:533
 msgid "Edit Connection Parameters"
 msgstr "Editar os parámetros da conexión"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:696
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Produciuse un fallo ao recuperar a súa información persoal do servidor"
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:702
 msgid "Go online to edit your personal information."
 msgstr "Conéctese para editar a súa información persoal"
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:787
 msgid "_Edit Connection Parameters..."
 msgstr "_Editar os parámetros da conexión…"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1283
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Está seguro de que quere eliminar o grupo '%s' do seu computador?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1287
 msgid "This will not remove your account on the server."
 msgstr "Isto non eliminará a súa conta no servidor."
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3510,16 +3324,24 @@ msgstr ""
 "Está seguro de que quere proceder?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "_Desactivar"
 
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Omitir"
+
+#: ../src/empathy-accounts-dialog.c:2087
+msgid "_Connect"
+msgstr "_Conectar"
+
 # rever
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3537,8 +3359,8 @@ msgid "_Import…"
 msgstr "_Importar…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocolo:"
+msgid "Loading account information"
+msgstr "Cargando a información da conta"
 
 # rever
 #: ../src/empathy-accounts-dialog.ui.h:5
@@ -3551,12 +3373,8 @@ msgstr ""
 
 # rever
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol installed"
-msgstr "Non hai ningún protocolo instalado"
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Loading account information"
-msgstr "Cargando a información da conta"
+msgid "No protocol backends installed"
+msgstr "Non hai «backends» de protocolos instalados"
 
 # rever
 #: ../src/empathy-auth-client.c:286
@@ -3568,16 +3386,11 @@ msgid "Empathy authentication client"
 msgstr "Cliente de autenticación Empathy"
 
 # rever
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Persoas próximas"
-
-# rever
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr "- Cliente de son/vídeo Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de son/vídeo Empathy"
 
@@ -3623,33 +3436,33 @@ msgstr "Detalles do contacto"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Chamar con %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "O enderezo IP como é visto polo computador"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "O enderezo IP como é visto por un servidor na Internet"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "O enderezo IP do par como é visto pola outra parte"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "O enderezo IP dun servidor de desvío"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "O enderezo IP do grupo multicast"
 
@@ -3670,12 +3483,12 @@ msgstr "Conectado — %d:%02dm"
 
 # rever
 #: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
 #: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3685,7 +3498,7 @@ msgstr ""
 "computador"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3695,7 +3508,7 @@ msgstr ""
 "computador"
 
 #: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3705,24 +3518,24 @@ msgstr ""
 "que non permite conexións directas."
 
 #: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "Produciuse un fallo na rede"
 
 #: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-call-window.c:3100
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de audio necesarios neste computador"
 
 #: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-call-window.c:3103
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de vídeo necesarios neste computador"
 
 #: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3734,22 +3547,22 @@ msgstr ""
 "xanela «Depurar» no menú Axuda."
 
 #: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "Produciuse un fallo ao chamar ao motor"
 
 #: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "Chegouse ao final do fluxo"
 
 #: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "Non é posíbel estabelecer un fluxo de audio"
 
 #: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "Non é posíbel estabelecer un fluxo de vídeo"
 
@@ -3771,23 +3584,23 @@ msgid "_Settings"
 msgstr "_Configuracións"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-roster-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:17
 #: ../src/empathy-streamed-media-window.ui.h:8
 msgid "_View"
 msgstr "_Ver"
 
 #: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Help"
 msgstr "A_xuda"
 
 #: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Contents"
 msgstr "_Contidos"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Debug"
 msgstr "_Depuración"
 
@@ -3864,8 +3677,8 @@ msgstr "Códec de codificación:"
 
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
 msgid "Unknown"
 msgstr "Descoñecido"
 
@@ -3884,45 +3697,93 @@ msgstr "Candidato remoto:"
 msgid "Local Candidate:"
 msgstr "Candidato local:"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "Audio"
 msgstr "Auto"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+# rever
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Pechar esta xanela?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Pechar esta xanela fará que abandone %s. Non recibirá máis mensaxes até que "
+"se una de novo."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Pechar esta xanela fará que abandone unha sala de chat. Non recibirá máis "
+"mensaxes até que se una de novo."
+msgstr[1] ""
+"Pechar esta xanela fará que abandone %u salas de chat. Non recibirá máis "
+"mensaxes até que se una de novo."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Pechar %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "Non recibirá máis mensaxes deste chat até que se una de novo."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Pechar a xanela"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Abandonar a sala"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d non lido)"
 msgstr[1] "%s (%d non lidos)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (e outro %u)"
 msgstr[1] "%s (e outros %u)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d non lido de outros)"
 msgstr[1] "%s (%d non lidos de outros)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d non lido de todos)"
 msgstr[1] "%s (%d non lidos de todos)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
 # rever
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3930,7 +3791,7 @@ msgstr[0] "Enviando %d mensaxe."
 msgstr[1] "Enviando %d mensaxes."
 
 # rever
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Escribindo unha mensaxe."
 
@@ -4022,7 +3883,7 @@ msgid "Incoming video call"
 msgstr "Chamada de vídeo entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
@@ -4039,7 +3900,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s estao chamando. Quérelle responder?"
 
 #: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chamada entrante de %s"
@@ -4058,7 +3919,7 @@ msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
 #: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Videochamada entrante de %s"
@@ -4107,7 +3968,7 @@ msgstr "Vostede foi convidado a unirse a %s"
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de ficheiro entrante de %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Requírese o contrasinal"
 
@@ -4249,8 +4110,12 @@ msgstr ""
 "Eliminar da lista as transferencias de ficheiros rematadas, canceladas e as "
 "que fallaron"
 
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importar"
+
 # rever
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4259,83 +4124,101 @@ msgstr ""
 "permite a importación de contas do Pidgin."
 
 # rever
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importar contas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Orixe"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Escriba o seu contrasinal"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Desconectar"
 
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Debe configurar unha conta para ver contactos aquí."
+
 # rever
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Non se atopou ningunha coincidencia."
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "As contas de %s non se poden usar até que non teña actualizado o seu "
 "software %s."
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Actualizar software…"
 
-#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Pechar"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Editar a conta"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Recargar %s (%s)…"
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Recargar o saldo da conta"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Recargar…"
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Debe activar unha das súas contas para ver contactos aquí."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Debe activar %s para ver contactos aquí."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Lista de contactos"
 
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Configuración da conta"
+
 #: ../src/empathy-roster-window-menubar.ui.h:2
 #: ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation…"
@@ -4376,59 +4259,55 @@ msgstr "Contactos no mapa"
 msgid "_Accounts"
 msgstr "_Contas"
 
-#: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "_Personal Information"
-msgstr "Información _persoal"
-
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "Contactos _bloqueados"
 
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "P_referencias"
 
-#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "Find in Contact _List"
 msgstr "_Buscar na lista de contactos"
 
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Ordenar por _nome"
 
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Ordenar por es_tado"
 
-#: ../src/empathy-roster-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "Normal Size With _Avatars"
 msgstr "Tamaño normal con _avatares"
 
-#: ../src/empathy-roster-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "N_ormal Size"
 msgstr "Tamañ_o normal"
 
-#: ../src/empathy-roster-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "Ta_maño compacto"
 
-#: ../src/empathy-roster-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "Sa_la"
 
-#: ../src/empathy-roster-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Unirse…"
 
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:26
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "Join _Favorites"
 msgstr "Unirse a pre_feridos"
 
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "Manage Favorites"
 msgstr "Xestionar as preferidas"
 
@@ -4458,6 +4337,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Si"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Non"
 
@@ -4517,7 +4401,7 @@ msgstr "Conversa nova"
 
 # rever
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "O contacto conéctase"
 
 # rever
@@ -4540,47 +4424,47 @@ msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Xulieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Oh, Romeo, Romeo!, ¿onde estás que non te vexo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Nega ao teu pai e rexeita o teu nome;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Ou, se non queres, xúrame tan só que me amas"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Y deixarei eu de ser unha Capuleto."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Debo escoitar máis ou contestar ao dito?"
 
 # rever
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Xulieta desconectouse"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -4598,85 +4482,92 @@ msgstr "Mostrar a _lista de contactos nas salas"
 msgid "Appearance"
 msgstr "Aparencia"
 
-# rever
 #: ../src/empathy-preferences.ui.h:4
-msgid "_Open new chats in separate windows"
-msgstr "A_brir as conversas novas en xanelas separadas"
+msgid "Start chats in:"
+msgstr "Iniciar conversas en:"
 
 #: ../src/empathy-preferences.ui.h:5
+msgid "new ta_bs"
+msgstr "lapelas no_vas"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "new _windows"
+msgstr "xan_elas novas"
+
+#: ../src/empathy-preferences.ui.h:7
 msgid "Display incoming events in the notification area"
 msgstr "Mostrar os eventos de entrada na área de notificación"
 
 # rever
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "_Automatically connect on startup"
 msgstr "_Conectar automaticamente ao iniciar"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
 msgid "Log conversations"
 msgstr "Rexistrar conversas"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "Xeral"
 
 # rever
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
 msgid "_Enable bubble notifications"
 msgstr "_Activar as burbullas de notificación"
 
 # rever
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
 msgid "Disable notifications when _away or busy"
 msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:14
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar as notificacións cando a _conversa non está enfocada"
 
 # rever
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
 msgid "Enable notifications when a contact comes online"
 msgstr "Activar as notificacións cando un contacto está conectado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:16
 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar as notificacións cando un contacto está desconectado"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Notificacións"
 
 # rever
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:18
 msgid "_Enable sound notifications"
 msgstr "_Activar as notificacións de son"
 
 # rever
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:19
 msgid "Disable sounds when _away or busy"
 msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Reproducir un son para os eventos"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:22
 msgid "Use _echo cancellation to improve call quality"
 msgstr "Usar cancelación de _eco para mellorar a calidade da chamada"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Echo cancellation helps to make your voice sound clearer to the other "
 "person, but may cause problems on some computers. If you or the other person "
@@ -4688,11 +4579,11 @@ msgstr ""
 "persoa escoita ruidos estranos ou ten problemas técnicos durante as chamadas "
 "tente desactivando a cancelación do eco e reiniciando a chamada."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Publish location to my contacts"
 msgstr "_Publicar a miña localización aos meus contactos"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4703,33 +4594,33 @@ msgstr ""
 "aproximadas a 1 valor decimal."
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Reduce location accuracy"
 msgstr "_Reducir a precisión de localización"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:30
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:31
 msgid "_GPS"
 msgstr "_GPS"
 
 # rever
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Teléfono móbil"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Rede (IP, Wifi)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:34
 msgid "Location sources:"
 msgstr "Fontes de localización:"
 
 # rever
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:36
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4738,24 +4629,24 @@ msgstr ""
 "dicionario instalado."
 
 # rever
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Activar a verificación ortográfica para os idiomas:"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Verificación ortográfica"
 
 # rever
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "T_ema da conversa:"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Variante:"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Temas"
 
@@ -4822,63 +4713,63 @@ msgstr "Activar cámara e enviar o vídeo"
 msgid "Contact Map View"
 msgstr "Vista de mapa de contactos"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1585
 msgid "Save"
 msgstr "Gardar"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1761
 msgid "Debug Window"
 msgstr "Depurar xanela"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1848
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:1860
 msgid "Level "
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1879
 msgid "Debug"
 msgstr "Depuración"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1884
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:1889 ../src/empathy-debug-window.c:1935
 msgid "Message"
 msgstr "Mensaxe"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1894
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:1899
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:1904
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:1923
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1926
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:1928
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:1930
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:1953
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4899,38 +4790,33 @@ msgstr "Seleccione o contacto que quere invitar á conversa:"
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Non mostra ningún diálogo, fai algún traballo (p.ex. importar) e sae"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Non mostrar ningún diálogo a non ser que só existan contas «Persoas próximas»"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Conta fornecida seleccionada inicialmente (p.ex. gabble/jabber/"
 "foo_40exemplo_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
 # rever
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Mostrar o asistente de contas"
-
-# rever
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Contas de Empathy"
 
 # rever
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Contas de Empathy"
 
@@ -4947,7 +4833,7 @@ msgid "Empathy Debugger"
 msgstr "Depurador de Empathy"
 
 # rever
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Cliente de conversa Empathy"
 
@@ -4956,14 +4842,14 @@ msgid "Respond"
 msgstr "Responder"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Rexeitar"
 
 # rever
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "Responder"
 
@@ -4995,39 +4881,39 @@ msgstr "%s tentou chamarlle, pero vostede estaba noutra chamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Duración"
 
 # rever
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3214
 #, c-format
 msgid "Your current balance is %s."
 msgstr "O seu balance actual é %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3218
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Non ten crédito dabondo para facer esta chamada."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3220
 msgid "Top Up"
 msgstr "Recargar"
 
@@ -5035,11 +4921,214 @@ msgstr "Recargar"
 msgid "_Match case"
 msgstr "_Coincidir con capitalizacio�n"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Que clase de conta de chat ten?"
+
 # rever
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Engadindo conta nova"
 
+# rever
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Persoas próximas"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+#, fuzzy
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy pode descubrir automaticamente e conversar con xente conectada na "
+"mesma rede que vostede. Se quere usar esta característica, comprobe que os "
+"detalles de abaixo son correctos. Vostede pode cambiar de forma sinxela eses "
+"detalles máis tarde ou desactivar esta característica usando o diálogo "
+"\"Contas\""
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+
+# rever
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Produciuse un erro ao importar as contas."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Produciuse un erro ao procesar os detalles da conta."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Produciuse un erro ao crear a conta."
+
+#~ msgid "There was an error."
+#~ msgstr "Produciuse un erro."
+
+# rever
+#~ msgid "The error message was: %s"
+#~ msgstr "A mensaxe do erro foi: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Pode ben volver atrás e tentar introducir outra vez os detalles ou saír "
+#~ "deste asistente e engadir as contas máis tarde desde o menú Editar."
+
+#~ msgid "An error occurred"
+#~ msgstr "Produciuse un erro"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Ten algunha outra conta de chat que queira estabelecer?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Introduza os seus detalles de conta"
+
+# rever
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Que clase de conta de chat quere crear?"
+
+# rever
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Quere crear outras contas de chat?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Introduza os detalles para a nova conta"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Con Empathy pode falar en liña con persoas próximas e con amigos e "
+#~ "colegas que usen Google Talk, AIM, Windows Live e calquera outro programa "
+#~ "de chat. Cun micrófono ou unha cámara web tamén pode ter chamadas de "
+#~ "audio ou vídeo."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "Ten algunha outra conta que estea usando con outro programa de chat?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Si, importar os detalles da miña conta desde "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Si, introducirei os meus detalles de conta agora"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Non, quero crear unha conta nova"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Non, só quero ver á xente conectada que estea próxima por agora"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Seleccione as contas que quere importar:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Non, isto é todo por agora"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Editar->Contas"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "_Non quero activar esta característica por agora"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Vostede non poderá conversar con xente conectada á súa rede local xa que "
+#~ "telepathy-salut non está instalado.\n"
+#~ "Se quere activar esta característica, instale o paquete telepathy-salut e "
+#~ "cree unha conta de Persoas próximas desde o diálogo Contas"
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut non está instalado"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Asistente de contas de mensaxaría e VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Benvido/a ao Empathy"
+
+# rever
+#~ msgid "Import your existing accounts"
+#~ msgstr "_Importar as súas contas existentes"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Insira os detalles persoais"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protocolo:"
+
+# rever
+#~ msgid "Show account assistant"
+#~ msgstr "Mostrar o asistente de contas"
+
+# rever
+#~ msgid "Linked Contacts"
+#~ msgstr "Contactos ligados"
+
+# rever
+#~ msgid "Select contacts to link"
+#~ msgstr "Seleccione os contactos a ligar"
+
+#~ msgid "New contact preview"
+#~ msgstr "Vista previa do contacto novo"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda"
+
+# rever
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Ligar contactos…"
+
+# rever
+#~ msgid "Link Contacts"
+#~ msgstr "Ligar contactos"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Desligar…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Separar por completo o contacto ligado nos contactos que contén."
+
+#~ msgid "_Link"
+#~ msgstr "_Ligar"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Desexa desligar os contactos ligados «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Está seguro que quere desligar estes contactos ligados? Isto separará por "
+#~ "completo os contactos ligados en contactos separados."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Desligar"
+
+#~ msgid "Personal Information"
+#~ msgstr "Información persoal"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Información _persoal"
+
+# rever
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "A_brir as conversas novas en xanelas separadas"
+
 #~ msgid "Call volume"
 #~ msgstr "Volume da chamada"
 
diff --git a/po/he.po b/po/he.po
index ff11676c6..cc0a5f5c4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-30 10:44+0200\n"
-"PO-Revision-Date: 2011-12-30 10:45+0200\n"
+"POT-Creation-Date: 2012-02-17 15:10+0200\n"
+"PO-Revision-Date: 2012-02-17 15:19+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -33,6 +33,16 @@ msgstr "�Empathy מסרי� מידיי�"
 msgid "IM Client"
 msgstr "לקוח מסרי� מידיי�"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "ניהול חשבונות התכתבות ו־VoIP"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "חשבונות התכתבות ו־VoIP"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Always open a separate chat window for new chats."
@@ -162,286 +172,292 @@ msgid "Hide the main window."
 msgstr "Hide the main window."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "Inform other users when you are typing to them"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Last account selected in Join Room dialog"
 msgstr "Last account selected in Join Room dialog"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Nick completed character"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Open new chats in separate windows"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Path of the Adium theme to use"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Play a sound for incoming messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Play a sound for new conversations"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Play a sound for outgoing messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Play a sound when a contact logs in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Play a sound when a contact logs out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Play a sound when we log in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Play a sound when we log out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Pop up notifications if the chat isn't focused"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Pop up notifications when a contact logs in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Pop up notifications when a contact logs out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Position the camera preview should be during a call."
 msgstr "Position the camera preview should be during a call."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "Show Balance in contact list"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Show avatars"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "Show contact groups"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Show contact list in rooms"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Show hint about closing the main window"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "Show offline contacts"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "Show protocols"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "The default folder to save file transfers in."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "The last directory that an avatar image was chosen from."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "The position for the chat window side pane"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "The stored position (in pixels) of the chat window side pane."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "The theme that is used to display the conversation in chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "The theme variant that is used to display the conversation in chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Use graphical smileys"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Use notification sounds"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Use theme for chat rooms"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Whether Empathy can publish the user's location to their contacts."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Whether Empathy can use the GPS to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Whether Empathy can use the cellular network to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Whether Empathy can use the network to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Whether Empathy should automatically log into your accounts on startup."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Whether Empathy should go into away mode automatically if the user is idle."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Whether Empathy should reduce the location's accuracy for privacy reasons."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Whether Empathy should use the avatar of the contact as the chat window icon."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
 msgstr "Whether connectivity managers should be used to automatically disconnect/reconnect."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to check words typed against the languages you want to check with."
 msgstr "Whether to check words typed against the languages you want to check with."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Whether to convert smileys into graphical images in conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Whether to enable Pulseaudio's echo cancellation filter."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Whether to play a sound to notify of contacts logging into the network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Whether to play a sound to notify of contacts logging out of the network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Whether to play a sound to notify of events."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Whether to play a sound to notify of incoming messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Whether to play a sound to notify of new conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Whether to play a sound to notify of outgoing messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Whether to play a sound when logging into a network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Whether to play a sound when logging out of a network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Whether to play sound notifications when away or busy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Whether to show a popup notification when a contact goes offline."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Whether to show a popup notification when a contact goes online."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
 msgstr "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Whether to show a popup notification when receiving a new message."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr "Whether to show account balances in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "Whether to show avatars for contacts in the contact list and chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Whether to show contacts that are offline in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr "Whether to show groups in the contact list."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Whether to show popup notifications when away or busy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Whether to show protocols for contacts in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Whether to show the contact list in chat rooms."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "Whether to show the contact list in compact mode."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
 msgstr "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "Whether to use the theme for chat rooms."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
-msgstr "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
-
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "ניהול חשבונות התכתבות ו־VoIP"
-
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "חשבונות התכתבות ו־VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name."
+msgstr "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name."
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -468,7 +484,7 @@ msgid "The other participant is unable to transfer the file"
 msgstr "המשתתף ה�חר ל� יכול להעביר �ת הקובץ"
 
 #: ../libempathy/empathy-ft-handler.c:754
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "סיבה ל� ידועה"
 
@@ -505,221 +521,225 @@ msgstr "התקשרת ל%s"
 msgid "Call from %s"
 msgstr "שיחה מ�ת %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "זמין"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "מרוחק"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "בלתי נר�ה"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "ל� מחובר"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "ל� ידוע"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "ל� צויינה סיבה"
 
-#: ../libempathy/empathy-utils.c:285
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "המצב מוגדר כמנותק"
 
-#: ../libempathy/empathy-utils.c:287
-#: ../libempathy/empathy-utils.c:321
+#: ../libempathy/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:289
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "ה�ימות נכשל"
 
-#: ../libempathy/empathy-utils.c:291
-#: ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "שגי�ת הצפנה"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "הש� בשימוש"
 
-#: ../libempathy/empathy-utils.c:295
-#: ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "ל� סופקה תעודה"
 
-#: ../libempathy/empathy-utils.c:297
-#: ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "התעודה �ינה מ�ובטחת"
 
-#: ../libempathy/empathy-utils.c:299
-#: ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "התעודה ל� תקפה"
 
-#: ../libempathy/empathy-utils.c:301
-#: ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "התעודה �ינה פעילה"
 
-#: ../libempathy/empathy-utils.c:303
-#: ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "ש� המ�רח בתעודה ל� תו��"
 
-#: ../libempathy/empathy-utils.c:305
-#: ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "טביעת ה�צבע של התעודה �ינה תו�מת"
 
-#: ../libempathy/empathy-utils.c:307
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "תעודה בחתימה עצמית"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "שגי�ת תעודה"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "�ין הצפנה זמינה"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "התעודה שגויה"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "החיבור נתקל בסירוב"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "ל� ניתן לקיי� �ת החיבור"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "החיבור נקטע"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "המש�ב כבר מחובר לשרת"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "חשבון זה כבר מחובר לשרת"
+
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "החיבור הוחלף בחיבור חדש ב�מצעות �ותו המש�ב"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "החשבון כבר קיי� בשרת"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "השרת עסוק מכדי לטפל בחיבור"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "התעודה נשללה"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "התעודה משתמשת ב�לגורית� הצפנה בלתי מ�ובטח �ו שהו� חלש מבחינה קריפטוגרפית"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "�ורך �ישור ה�בטחה של השרת �ו עומק מחרוזת �ישור ה�בטחה של השרת חורגי� מהמגבלות שהוצבו על ידי ספריית ההצפנה"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "התכנה שלך ישנה מדי"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "שגי�ה פנימית"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "�נשי� בקרבתי"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "�Yahoo! יפן"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "צ׳�ט Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "לפני שנייה"
 msgstr[1] "לפני %d שניות"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "לפני דקה"
 msgstr[1] "לפני %d דקות"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "לפני שעה"
 msgstr[1] "לפני %d שעות"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "לפני יו�"
 msgstr[1] "לפני %d ימי�"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "לפני שבוע"
 msgstr[1] "לפני %d שבועות"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "לפני חודש"
 msgstr[1] "לפני %d חודשי�"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "בעתיד"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "כל החשבונות"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "חשבון"
 
@@ -737,30 +757,30 @@ msgstr "שרת"
 msgid "Port"
 msgstr "פתחה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "ש_� משתמש:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "ה_חלה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_כניסה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "חשבון זה כבר קיי� על השרת"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "יצירת חשבון חדש על השרת"
 
@@ -769,19 +789,19 @@ msgstr "יצירת חשבון חדש על השרת"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "�%1$s על גבי %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "חשבון %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "חשבון חדש"
 
@@ -1254,188 +1274,194 @@ msgstr "�ין תמיכה בשיחות חירו� בפרוטוקול זה"
 msgid "You don't have enough credit in order to place this call"
 msgstr "�ין לך די �שר�י כדי לבצע שיחה זו"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "�רע כשל בפתיחת שיחה פרטית"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "�ין תמיכה בשימוש בנוש� בדיון זה"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "�ין לך הרש�ה לשנות �ת הנוש�"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" �ינו מזהה �יש קשר ל� תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: פינוי כל ההודעות מהדיון הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <נוש�>:‎ הגדרת נוש� השיחה הנוכחית"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<זיהוי החדר>]‎ [<סיבה>]:‎ עזיבת ערוץ השיחה, הנוכחי הו� בררת המחדל"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <זיהוי �יש הקשר> ‎[<הודעה>]:‎ פתיחת צ׳�ט �ישי"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <זיהוי �יש הקשר>‎ <הודעה>:‎ פתיחת צ׳�ט פרטי"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <כינוי>:‎ שינוי הכינוי שלך בשרת הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <הודעה>:‎ שליחת הודעת ACTION לדיון הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <הודעה>:‎ שליחת <הודעה> לדיון הנוכחי. פקודה זו משמשת לשליחת הודעות המתחילות ב־'/'. לדוגמה: \"/say /join משמשת לצורך התחברות לחדר שיחה חדש\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <מזהה המשתמש>:‎ הצגת פרטי� על �יש הקשר"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<פקודה>]:‎ הצגת כל הפקודות הנתמכות. �� יש הגדרה ל־<פקודה> יוצג �ופן הפעלתה."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "שימוש: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "פקודה ל� ידועה"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "פקודה בלתי מוכרת; יש לעיין ב־‎/help לצפייה בפקודות הזמינות"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "המ�זן �ינו מ�פשר לשלוח הודעה"
 
-#: ../libempathy-gtk/empathy-chat.c:1460
-#: ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568
+#: ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "שגי�ה בשליחת ההודעה '%s': �%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
-#: ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570
+#: ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "שגי�ה בשליחת ההודעה: �%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "המ�זן �ינו מ�פשר לשלוח הודעה. <a href='%s'>Top up</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "לל� יכולת"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "ל� מחובר"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "�יש קשר ל� תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "�יש קשר ל� תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "הודעה �רוכה מדי"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "ל� ממומש"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "ל� ידוע"
 
-#: ../libempathy-gtk/empathy-chat.c:1598
-#: ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706
+#: ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "נוש�:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "הנוש� הוגדר ל־: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "הנוש� הוגדר על ידי %s בתור: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "ל� נקבע נוש�"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(�ין הצעות)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "הוספת '%s' למילון"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "הוספת '%s' למילון %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "הכנס סמיילי"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_שלח"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "הצעות _�יות"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "�רע כשל בקבלת הדוחות ה�חרוני�"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "�%s התנתק"
@@ -1443,12 +1469,12 @@ msgstr "�%s התנתק"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "�%1$s סולק על ידי %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "�%s סולק"
@@ -1456,17 +1482,17 @@ msgstr "�%s סולק"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "�%1$s נחס� על ידי %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "�%s נחס�"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "�%s עזב �ת החדר"
@@ -1476,17 +1502,17 @@ msgstr "�%s עזב �ת החדר"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "�%s הצטרף לחדר"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "�%s נודע כעת בכינוי %s"
@@ -1494,58 +1520,58 @@ msgstr "�%s נודע כעת בכינוי %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../libempathy-gtk/empathy-chat.c:2993
 #: ../src/empathy-streamed-media-window.c:1889
 #: ../src/empathy-event-manager.c:1280
-#: ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588
-#: ../src/empathy-call-window.c:2631
+#: ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595
+#: ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "מנותק"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "ה�� ברצונך ל�חסן ססמה זו?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "שמירה"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "ל� כעת"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "ניסיון חוזר"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "ססמה שגויה; נ� לנסות שוב:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "חדר זה מוגן בססמה:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "הצטרפות"
 
-#: ../libempathy-gtk/empathy-chat.c:3901
+#: ../libempathy-gtk/empathy-chat.c:4070
 #: ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "מחובר"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "שיחה"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1590,7 +1616,7 @@ msgstr "�נשי קשר חסומי�"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "הסרה"
@@ -1613,33 +1639,29 @@ msgstr "_פתיחת קישור"
 msgid "%A %B %d %Y"
 msgstr "%A %d ב%B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "מידע �ישי"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "�יש קשר חדש"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "ה�� לחסו� �ת %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "ה�� �כן ברצונך לחסו� �ת �פשרות ההתקשרות של '%s' �ליך?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "ח_סימה"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1838,6 +1860,16 @@ msgstr "שמירת תמונה �ישית"
 msgid "Unable to save avatar"
 msgstr "ל� ניתן לשמור תמונה �ישית"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "פרטי� �ישיי�"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "פרטי �יש קשר"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "ש� מל�"
@@ -1921,11 +1953,6 @@ msgstr "נתוני הלקוח"
 msgid "Client:"
 msgstr "לקוח:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "פרטי �יש קשר"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
@@ -1946,25 +1973,25 @@ msgstr "מערכת הפעלה:"
 msgid "Version:"
 msgstr "גרסה:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "קבוצות"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
 msgstr "יש לבחור �ת הקבוצות בהן �תה מעוניין ש�יש קשר זה יופיע.  ניתן לבחור ביותר מקבוצה �חת �ו ל� לבחור קבוצות בכלל."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "הוס_פת קבוצה"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "בחירה"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1949
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "קבוצה"
 
@@ -1984,161 +2011,145 @@ msgstr[1] "ל� ניתן לחסו� �ת בעלי הזהות הב�י�:"
 msgid "Edit Contact Information"
 msgstr "עריכת מידע �יש קשר"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "�נשי קשר מקושרי�"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "בחירת �נשי קשר לקישור"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "תצוגה מקדימה של �יש קשר חדש"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "�נשי הקשר שנבחרו ברשימה שמימין יקושרו זה לזה."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "נ� לבחור �ת החשבון לשימוש לצורך ההתקשרות"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "התקשרות"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "סלולרי"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "עבודה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "בית"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "ח_סימת �יש קשר"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_שיחה"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "שיחה _קולית"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "שיחת _ויד�ו"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Previous Conversations"
 msgstr "שיחות _קודמות"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "שליחת קובץ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "שיתוף שולחן העבודה שלי"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "מועדף"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "ל� הותקנה התכנית gnome-contacts"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "נ� להתקין �ת gnome-contacts כדי לכשת לפרטי �נשי הקשר."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "_מידע"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ע_ריכה"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_קישור �נשי קשר…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1175
 msgid "Inviting you to this room"
 msgstr "מזמין/ה �ותך לחדר זה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "ה_זמנה לחדר שיחה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-main-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "הוספת _�יש קשר…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "מחיקה ו_חסימה"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "ה�� להסיר �ת הקבוצה '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "הקבוצה מוסרת"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "ה_סרה"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "להסיר �ת �יש הקשר '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "ה�� �כן ברצונך להסיר �ת �יש הקשר המקושר '%s'? נ� לשי� לב שפעולה זו תסיר �ת כל �נשי הקשר המת�גדי� ל�יש קשר מקושר זה."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "�יש קשר מוסר"
 
@@ -2157,19 +2168,19 @@ msgstr "<b>מיקו�</b> ב(ת�ריך)"
 msgid "Online from a phone or mobile device"
 msgstr "בחיבור סלולרי �ו דרך התקן נייד"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "רשת חדשה"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "בחירת רשת IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_�יפוס רשימת הרשתות"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "בחירה"
@@ -2182,44 +2193,6 @@ msgstr "שרת חדש"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "קישור בין �נשי קשר"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "ה_פרדה…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "פיצול �יש הקשר המקושר המוצג ל�נשי הקשר �ות� הו� מכיל."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_קישור"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "ה�� לפרק �ת �יש הקשר המקושר '%s'?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
-msgstr "ה�� ב�מת ברצונך לפרק �יש קשר מקושר זה? פעולה זו תפריד �ת הקשר המקושר הזה ל�נשי הקשר �ותו הו� מכיל."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_ניתוק"
-
 #: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "היסטוריה"
@@ -2378,7 +2351,7 @@ msgstr "ויד�ו"
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "ע_ריכה"
 
@@ -2580,12 +2553,12 @@ msgstr "שיחה קולית הסתיימה"
 msgid "Edit Custom Messages"
 msgstr "עריכת הודעה מות�מת"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "ההודעה נערכה ב־%s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "רגיל"
 
@@ -2660,39 +2633,43 @@ msgid "Certificate hostname: %s"
 msgstr "מ�רח �ישור ה�בטחה: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "המשך"
+msgid "C_ontinue"
+msgstr "המ_שך"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "חיבור מפוקפק"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "חיבור זה �ינו מהימן. ה�� ברצונך להמשיך בכל מקרה?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "יש לזכור בחירה זו עבור חיבורי� עתידיי�"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "פרטי התעודה"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "ל� ניתן לפתוח �ת הכתובת"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "בחירת קובץ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "�ין די מקו� פנוי לשמירת הקובץ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "נדרשי� %s של מקו� פנוי כדי לשמור קובץ זה, �ך ישנ� רק %s פנויי�. נ� לבחור במיקו� �חר."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "קובץ נכנס מ־%s"
@@ -2924,203 +2901,73 @@ msgstr ""
 "פרוייקט תרגו� GNOME לעברית:\n"
 "�http://gnome-il.berlios.de"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "�רעה שגי�ה בזמן יבו� החשבונות."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "�רעה שגי�ה בעת ניתוח נתוני החשבון."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "�רעה שגי�ה במהלך יצירת החשבון."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "�רעה שגי�ה."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "הודעת השגי�ה הייתה: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "ניתן לחזור �חורה ולנסות להקליד �ת פרטי החשבון שוב �ו לצ�ת ממסייע זה ולהוסיף חשבונות מ�וחר יותר מתפריט העריכה."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "התרחשה שגי�ה."
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "�ילו חשבונות יש לך?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "ה�� יש לך חשבונות נוספי� שברצונך להגדיר?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "נ� להזין �ת פרטי החשבון שלך"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "�יזה חשבון שיחות ברצונך ליצור?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "ה�� ברצונך ליצור חשבונות שיחה �חרי�?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "נ� להזין �ת הפרטי� עבור החשבון החדש"
-
-#: ../src/empathy-account-assistant.c:614
-msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "בעזרת Empathy ניתן לשוחח ע� �נשי� קרובי� המחוברי� לרשת וע� חברי� ועמיתי� לעבודה המשתמשי� ב־Google Talk, �AIM,� Windows Live ועוד תוכנות דומות רבות. בעזרת המיקרופון ומצלמת הרשת שלך ניתן ג� לנהל שיחות קול וויד�ו."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "יש לך חשבון שהשתמשת בו ע� תוכנת שיחה �חרת?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "כן, נ� לייב� �ת פרטי החשבון מ־"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "כן, �ני �זין �ת פרטי החשבון עכשיו"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "ל�, �ני רוצה חשבון חדש"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "ל�, �ני רק רוצה לר�ות �נשי� המחוברי� בקרבת מקו� לעת עתה"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "נ� לבחור �ת החשבון שברצונך לייב�:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "כן"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "ל�, זה הכול לעכשיו"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "ב�פשרות Empathy לגלות ולנהל שיחות ע� �נשי� המחוברי� ל�ותה הרשת כמוך. �� ברצונך להשתמש בתכונה זו, נ� לבדוק שהפרטי� שלהלן נכוני�. ניתן לשנות פרטי� �לה בקלות מ�וחר יותר �ו לבטל תכונה זו ב�מצעות הדו־שיח 'חשבונות'"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "עריכה->חשבונות"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "�ין לי _כל עניין ל�פשר �ת התכונה הזו כעת"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "ל� ניתן יהיה לשוחח ע� �נשי� המחוברי� לרשת המקומית שלך כיוון ש־telepathy-salut �ינה מותקנת, �� ברצונך להפעיל תכונה זו עליך להתקין �ת החבילה telepathy-salut וליצור חשבון ב'�נשי� בקרבתי' מדו־שיח החשבונות"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut �ינה מותקנת"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "מסייע חשבונות ההתכתבות וה־VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "ברוך בו�ך �ל Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "ייבו� חשבונות קיימי�"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "נ� להזין פרטי� �ישיי�"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:71
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "ישנ� שינויי� של� נשמרו בחשבון ה־%s שלך."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:75
 msgid "Your new account has not been saved yet."
 msgstr "החשבון החדש שלך ל� נשמר עדיין."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:347
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "בהתחברות…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "ל� מחובר — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "מנותק  — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "מנותק — �ין חיבור לרשת"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "מצב ל� ידוע"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
 msgstr "מנותק — החשבון מנוטרל"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:533
 msgid "Edit Connection Parameters"
 msgstr "עריכת הגדרות החיבור"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:696
 msgid "Failed to retrieve your personal information from the server."
 msgstr "�ירע כשל בקבלת הפרטי� ה�ישיי� שלך מהשרת."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:702
 msgid "Go online to edit your personal information."
 msgstr "עליך להתחבר כדי לערוך �ת הפרטי� ה�ישיי� שלך."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:787
 msgid "_Edit Connection Parameters..."
 msgstr "ע_ריכת הגדרות החיבור..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1283
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "ה�� ברצונך להסיר �ת החשבון '%s' ממחשבך?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1287
 msgid "This will not remove your account on the server."
 msgstr "פעולה זו ל� תסיר �ת חשבונך מהשרת."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3129,15 +2976,23 @@ msgstr ""
 "�ת השינויי� שלך. ה�ת �תה בטוח שברצונך להמשיך?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "ה_פעלה"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "נ_טרול"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_דילוג"
+
+#: ../src/empathy-accounts-dialog.c:2087
+msgid "_Connect"
+msgstr "הת_חברות"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3154,18 +3009,14 @@ msgid "Loading account information"
 msgstr "פרטי �יש הקשר נטעני�"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "�ין פרוטוקולי� מותקני�"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "פרוטוקול:"
+msgid "No protocol backends installed"
+msgstr "�ין מנגנוני פרוטוקולי� מותקני�"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "To add a new account, you first have to install a backend for each protocol you want to use."
 msgstr "על מנת להוסיף חשבון חדש עליך להתקין מנוע לכל פרוטוקול שבו ברצונך להשתמש."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "י_בו�…"
 
@@ -3177,17 +3028,13 @@ msgstr "- לקוח ה�ימות של Empathy"
 msgid "Empathy authentication client"
 msgstr "לקוח ה�ימות של Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "�נשי� בקרבתי"
-
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr "- לקוח השמע/הוויד�ו Empathy"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:218
+#: ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "לקוח השמע/הוויד�ו Empathy"
 
@@ -3230,33 +3077,33 @@ msgstr "פרטי�"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "שיחה ע� %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "כתובת ה־IP כפי שנר�ית על ידי המחשב"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "כתובת ה־IP כפי שנר�ית על ידי שרת ב�ינטרנט"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "כתובת ה־IP כדי שנר�ית על ידי עמית מהצד השני"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "כתובת ה־IP של שרת הממסר"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "כתובת ה־IP של קבוצת התשדורת"
 
@@ -3275,66 +3122,66 @@ msgid "Connected — %d:%02dm"
 msgstr "מחובר — %d:%02d דק׳"
 
 #: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "פרטי� טכניי�"
 
 #: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "התכנה של %s �ינה מבינה �ת מבני השמע הנתמכי� על ידי המחשב שלך"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "התכנה של %s �ינה מבינה �ת מבני הוויד�ו הנתמכי� על ידי המחשב שלך"
 
 #: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "ל� ניתן להפעיל �ת החיבור �ל %s. כנר�ה �חד ממשתתפי השיחה מחובר לרשת ש�ינה מ�פשרת חיבורי� ישירי�."
 
 #: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "�ירעה שגי�ה ברשת"
 
 #: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-call-window.c:3100
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "מבני השמע הדרושי� לקיו� שיחה זו �ינ� מותקני� במחשבך"
 
 #: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-call-window.c:3103
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "מבני הוויד�ו הדרושי� לקיו� שיחה זו �ינ� מותקני� במחשבך"
 
 #: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "משהו בלתי צפוי �רע ברכיב של Telepathy. נ� <a href=\"%s\">לדווח על ב�ג זה</a> ולהוסיף דוחות שנ�ספו מחלון 'ניפוי השגי�ות' שבתפריט העזרה."
 
 #: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "�ירעה שגי�ה במנוע הקרי�ה"
 
 #: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "התזרי� הגיע לסיומו"
 
 #: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "ל� ניתן לקיי� תזרי� שמע"
 
 #: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "ל� ניתן לקיי� תזרי� ויד�ו"
 
@@ -3426,10 +3273,10 @@ msgstr "החלפת מצב העברת ויד�ו"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580
-#: ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2587
+#: ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589
+#: ../src/empathy-call-window.c:2590
 msgid "Unknown"
 msgstr "ל� ידוע"
 
@@ -3448,18 +3295,18 @@ msgstr "מ_צלמה"
 
 #: ../src/empathy-call-window.ui.h:26
 #: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_תכני�"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_ניפוי שגי�ות"
 
 #: ../src/empathy-call-window.ui.h:29
 #: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "ע_זרה"
 
@@ -3472,52 +3319,85 @@ msgid "_Settings"
 msgstr "ה_גדרות"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../src/empathy-chat-window.c:481
-#: ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:285
+msgid "Close this window?"
+msgstr "ה�� לסגור חלון זה?"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr "סגירת חלון זה תגרו� לעזיבת %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] "סגירת חלון זה תוביל לעזיבת חדר הצ׳�ט. ל� יתקבלו עוד הודעות עד להתחברותך מחדש �ליו."
+msgstr[1] "סגירת חלון זה תוביל לעזיבת %u חדרי הצ׳�ט. ל� יתקבלו עוד הודעות עד להתחברותך מחדש �ליה�."
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+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 "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)"
 msgstr[0] "�%s (�חת של� נקר�ה)"
 msgstr[1] "�%s �(%d של� נקר�ו)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "�%s (ו�חד נוסף)"
 msgstr[1] "�%s (ו־%u נוספי�)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "�%s (�חת של� נקר�ה מ�חרי�)"
 msgstr[1] "�%s (%d של� נקר�ו מ�חרי�)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "�%s (�חת של� נקר�ה מכול�)"
 msgstr[1] "�%s (%d של� נקר�ו מכול�)"
 
-#: ../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"
 msgstr[0] "נשלחת הודעה �חת"
 msgstr[1] "נשלחות %d הודעות"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
 msgstr "הודעה מוקלדת."
 
@@ -3603,7 +3483,7 @@ msgid "Incoming video call"
 msgstr "שיחה קולית נכנסת"
 
 #: ../src/empathy-event-manager.c:523
-#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "שיחה נכנסת"
 
@@ -3620,7 +3500,7 @@ msgstr "�%s מתקשר �ליך, ה�� ברצונך לענות?"
 #: ../src/empathy-event-manager.c:531
 #: ../src/empathy-event-manager.c:732
 #: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "שיחה נכנסת מ־%s"
@@ -3640,7 +3520,7 @@ msgstr "מ_ענה ע� ויד�ו"
 
 #: ../src/empathy-event-manager.c:732
 #: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "שיחת ויד�ו נכנסת מ־%s"
@@ -3684,7 +3564,7 @@ msgid "Incoming file transfer from %s"
 msgstr "העברת קבצי� נכנסת מ־%s"
 
 #: ../src/empathy-event-manager.c:1147
-#: ../src/empathy-main-window.c:375
+#: ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "נדרשת ססמה"
 
@@ -3816,172 +3696,190 @@ msgstr "העברות קבצי�"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "הסרת העברות קבצי� שהושלמו, בוטלו �ו נכשלו מהרשימה"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "י_בו�"
+
+#: ../src/empathy-import-dialog.c:88
 msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
 msgstr "ל� נמצ�ו חשבונות לייבו�. Empathy תומך כרגע בייבו� חשבונות מ־Pidgin בלבד."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "יבו� חשבונות"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "יבו�"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "מקור"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "הזנת ססמה"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "ניתוק"
 
-#: ../src/empathy-main-window.c:635
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "עליך להגדיר חשבון כדי שיופיעו כ�ן �נשי קשר."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "ל� נמצ�ה הת�מה"
 
-#: ../src/empathy-main-window.c:743
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "ל� ניתן להשתמש בחשבונות %s עד שהתכנה %s תעודכן, עמך הסליחה."
 
-#: ../src/empathy-main-window.c:811
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "עדכון התכנה..."
 
-#: ../src/empathy-main-window.c:817
-#: ../src/empathy-main-window.c:938
+#: ../src/empathy-roster-window.c:855
+#: ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "סגירה"
 
-#: ../src/empathy-main-window.c:926
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "התחברות מחדש"
 
-#: ../src/empathy-main-window.c:932
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "עריכת חשבון"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1071
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Top up %s (%s)..."
 
-#: ../src/empathy-main-window.c:1118
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "�שר�י חשבון ה־Top up"
 
 #. top up button
-#: ../src/empathy-main-window.c:1189
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Top Up..."
 
-#: ../src/empathy-main-window.c:1931
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "�יש קשר"
 
-#: ../src/empathy-main-window.c:2306
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "עליך להפעיל �ת �חד החשבונות שלך כדי שיופיעו כ�ן �נשי קשר."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "עליך להפעיל �ת %s כדי שיופיעו כ�ן �נשי קשר."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "רשימת �נשי קשר"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "הגדרות החשבון"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "�נשי קשר על ה_מפה"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "מ�זן ה�שר�י"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "_חיפוש ברשימת �נשי הקשר"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "_צירוף למועדפי�"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "ניהול מועדפי�"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "גודל _רגיל"
 
-#: ../src/empathy-main-window-menubar.ui.h:7
+#: ../src/empathy-roster-window-menubar.ui.h:7
 #: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "_שיחה חדשה…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "גודל רגיל ע� _תמונות �ישיות"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "העד_פות"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "הצגת פ_רוטוקולי�"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "מיון לפי _ש�"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "מיון לפי _מצב"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_חשבונות"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "�נשי קשר _חסומי�"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "גודל _קומפקטי"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "העברות _קבצי�"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "ה_צטרפות…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_שיחה חדשה…"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "�נשי קשר _ל� מחוברי�"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "מידע _�ישי"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "_חדר"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_חיפוש �חר �נשי קשר…"
 
@@ -3995,7 +3893,7 @@ msgstr "חברי�"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4008,16 +3906,21 @@ msgstr ""
 "נדרשת ססמה: %s\n"
 "חברי�: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "כן"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "ל�"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "ל� ניתן להתחיל �ת הצגת החדרי�"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "ל� ניתן לעצור �ת הצגת החדרי�"
 
@@ -4058,8 +3961,8 @@ msgid "New conversation"
 msgstr "שיחה חדשה"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
-msgstr "�יש קשר מתחבר"
+msgid "Contact comes online"
+msgstr "�יש הקשר מתחבר"
 
 #: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
@@ -4078,46 +3981,46 @@ msgid "Language"
 msgstr "שפה"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "יוליה"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "רומי�ו"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "הו רומי�ו, רומי�ו, מן �ין שבת רומי�ו?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "התכחש ל�ביך וסרב לשמו;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "�ו �� ל� תסכי�, �שבע לך ב�הבתי"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "ול� �היה עוד בת קפולט."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "ה�� דיברתי די �ו שמ� �וסיף לדבר?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "יוליה התנתקה"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -4210,49 +4113,49 @@ msgid "Spell Checking"
 msgstr "בדיקת �יות"
 
 #: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "הפעלת צ׳�טי� ב־:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "The list of languages reflects only the languages for which you have a dictionary installed."
 msgstr "ברשימת השפות מוצגות שפות שעבורן מותקני� �צלך מילוני�."
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "ערכות נוש�"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr "שימוש ב_ביטול הד כדי לשפר �ת �יכות השיחה"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "הגוון:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "התחברות _�וטומטית ע� ההפעלה"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "טלפון _סלולרי"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "ה_פעלת התרעות בתוך בועה"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "ה_פעלת התרעות קוליות"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_רשת (IP, �לחוטית)"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_פתיחת שיחות חדשות בחלונות נפרדי�"
-
 #: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "_פרסו� המיקו� שלי ל�נשי הקשר שלי"
@@ -4262,6 +4165,14 @@ msgstr "_פרסו� המיקו� שלי ל�נשי הקשר שלי"
 msgid "_Reduce location accuracy"
 msgstr "ה_פחתת דיוק המיקו�"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "_חלונות חדשי�"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "_לשוניות חדשות"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "מצב"
@@ -4322,64 +4233,64 @@ msgstr "תצוגה מקדימה לוויד�ו"
 msgid "Contact Map View"
 msgstr "מפת �נשי קשר"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1585
 msgid "Save"
 msgstr "שמירה"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1761
 msgid "Debug Window"
 msgstr "חלון ניפוי שגי�ות"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1848
 msgid "Pause"
 msgstr "השהייה"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:1860
 msgid "Level "
 msgstr "רמה"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1879
 msgid "Debug"
 msgstr "ניפוי שגי�ות"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1884
 msgid "Info"
 msgstr "מידע"
 
-#: ../src/empathy-debug-window.c:1561
-#: ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:1889
+#: ../src/empathy-debug-window.c:1935
 msgid "Message"
 msgstr "הודעה"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1894
 msgid "Warning"
 msgstr "�זהרה"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:1899
 msgid "Critical"
 msgstr "קריטי"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:1904
 msgid "Error"
 msgstr "שגי�ה"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:1923
 msgid "Time"
 msgstr "זמן"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1926
 msgid "Domain"
 msgstr "תחו�"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:1928
 msgid "Category"
 msgstr "קטגוריה"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:1930
 msgid "Level"
 msgstr "רמה"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:1953
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "מנהל החיבורי� שנבחר �ינו תומך בהרחבת ניפוי שגי�ות מרחוק."
 
@@ -4396,31 +4307,27 @@ msgstr "נ� לבחור �נשי קשר להזמנה לדיון:"
 msgid "Invite"
 msgstr "הזמנה"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "�ין להציג דו־שיח כלשהו; תתבצע פעולה כלשהי (לדוגמה יבו�) ול�חריה התכנית תסגר"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "�ין להציג תיבות דו־שיח כלשהן �ל� �� כן ישנן חשבונות \"�נשי� בקרבתי\""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "בחירת החשבון הנתון כבר בהתחלה (לדוגמה gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "הצגת מסייע החשבונות"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- חשבונות Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "חשבונות Empathy"
 
@@ -4436,7 +4343,7 @@ msgstr "- מנפה השגי�ות של Empathy"
 msgid "Empathy Debugger"
 msgstr "מנפה השגי�ות של Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- לקוח הצ׳�טי� Empathy"
 
@@ -4445,13 +4352,13 @@ msgid "Respond"
 msgstr "תגובה"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "דחייה"
 
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "מענה"
 
@@ -4483,39 +4390,39 @@ msgstr "התקבלה בקשת שיחה מ×�ת %s, ×�ך ב×�ותו הזמן כב×
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1179
+#: ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "בהמתנה"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "השתק"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "משך"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d דק׳"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3214
 #, c-format
 msgid "Your current balance is %s."
 msgstr "המ�זן הנוכחי שלך הו� %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3218
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "�ין לך מספיק �שר�י כדי לבצע שיחה זו."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3220
 msgid "Top Up"
 msgstr "Top Up"
 
@@ -4523,10 +4430,184 @@ msgstr "Top Up"
 msgid "_Match case"
 msgstr "הת�מת _רישיות"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "�ילו חשבונות יש לך?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "נוסף חשבון חדש"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "�נשי� בקרבתי"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
+msgstr "ב�פשרות Empathy לגלות ולנהל שיחות ע� �נשי� המחוברי� ל�ותה הרשת כמוך. �� ברצונך להשתמש בתכונה זו, נ� לבדוק שהפרטי� שלהלן נכוני�."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr "ב�פשרותך לשנות פרטי� �לה מ�וחר יותר �ו לנטרל תכונה זו על ידי בחירה ב<span style=\"italic\">עריכה � חשבונות</span> ברשימת �נשי הקשר."
+
+#~ msgid "Linked Contacts"
+#~ msgstr "�נשי קשר מקושרי�"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "בחירת �נשי קשר לקישור"
+
+#~ msgid "New contact preview"
+#~ msgstr "תצוגה מקדימה של �יש קשר חדש"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "�נשי הקשר שנבחרו ברשימה שמימין יקושרו זה לזה."
+#~ msgctxt "Link individual (contextual menu)"
+
+#~ msgid "_Link Contacts…"
+#~ msgstr "_קישור �נשי קשר…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "קישור בין �נשי קשר"
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink…"
+#~ msgstr "ה_פרדה…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "פיצול �יש הקשר המקושר המוצג ל�נשי הקשר �ות� הו� מכיל."
+
+#~ msgid "_Link"
+#~ msgstr "_קישור"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "ה�� לפרק �ת �יש הקשר המקושר '%s'?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "ה�� ב�מת ברצונך לפרק �יש קשר מקושר זה? פעולה זו תפריד �ת הקשר המקושר הזה "
+#~ "ל�נשי הקשר �ותו הו� מכיל."
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink"
+#~ msgstr "_ניתוק"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "�רעה שגי�ה בזמן יבו� החשבונות."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "�רעה שגי�ה בעת ניתוח נתוני החשבון."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "�רעה שגי�ה במהלך יצירת החשבון."
+
+#~ msgid "There was an error."
+#~ msgstr "�רעה שגי�ה."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "הודעת השגי�ה הייתה: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "ניתן לחזור �חורה ולנסות להקליד �ת פרטי החשבון שוב �ו לצ�ת ממסייע זה "
+#~ "ולהוסיף חשבונות מ�וחר יותר מתפריט העריכה."
+
+#~ msgid "An error occurred"
+#~ msgstr "התרחשה שגי�ה."
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "ה�� יש לך חשבונות נוספי� שברצונך להגדיר?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "נ� להזין �ת פרטי החשבון שלך"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "�יזה חשבון שיחות ברצונך ליצור?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "ה�� ברצונך ליצור חשבונות שיחה �חרי�?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "נ� להזין �ת הפרטי� עבור החשבון החדש"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "בעזרת Empathy ניתן לשוחח ע� �נשי� קרובי� המחוברי� לרשת וע� חברי� ועמיתי� "
+#~ "לעבודה המשתמשי� ב־Google Talk, �AIM,� Windows Live ועוד תוכנות דומות רבות. "
+#~ "בעזרת המיקרופון ומצלמת הרשת שלך ניתן ג� לנהל שיחות קול וויד�ו."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "יש לך חשבון שהשתמשת בו ע� תוכנת שיחה �חרת?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "כן, נ� לייב� �ת פרטי החשבון מ־"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "כן, �ני �זין �ת פרטי החשבון עכשיו"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "ל�, �ני רוצה חשבון חדש"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "ל�, �ני רק רוצה לר�ות �נשי� המחוברי� בקרבת מקו� לעת עתה"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "נ� לבחור �ת החשבון שברצונך לייב�:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "ל�, זה הכול לעכשיו"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "עריכה->חשבונות"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "�ין לי _כל עניין ל�פשר �ת התכונה הזו כעת"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "ל� ניתן יהיה לשוחח ע� �נשי� המחוברי� לרשת המקומית שלך כיוון ש־telepathy-"
+#~ "salut �ינה מותקנת, �� ברצונך להפעיל תכונה זו עליך להתקין �ת החבילה "
+#~ "telepathy-salut וליצור חשבון ב'�נשי� בקרבתי' מדו־שיח החשבונות"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "מסייע חשבונות ההתכתבות וה־VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "ברוך בו�ך �ל Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "ייבו� חשבונות קיימי�"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "נ� להזין פרטי� �ישיי�"
+
+#~ msgid "Protocol:"
+#~ msgstr "פרוטוקול:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "הצגת מסייע החשבונות"
+
+#~ msgid "Personal Information"
+#~ msgstr "מידע �ישי"
+
+#~ msgid "_Personal Information"
+#~ msgstr "מידע _�ישי"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_פתיחת שיחות חדשות בחלונות נפרדי�"
+
 #~ msgid "My Web Accounts"
 #~ msgstr "החשבונות המקווני� שלי"
 
@@ -5025,9 +5106,6 @@ msgstr "נוסף חשבון חדש"
 #~ msgid "Unknown error code"
 #~ msgstr "מספר שגי�ה ל� ידוע"
 
-#~ msgid "msn account settings"
-#~ msgstr "הגדרות חשבון msn"
-
 #~ msgid "salut account settings"
 #~ msgstr "הגדרות חשבון salut"
 
diff --git a/po/ja.po b/po/ja.po
index 6da82ec74..51752cf95 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,5 +1,5 @@
 # empathy ja.po.
-# Copyright (C) 2007-2011 empathy's COPYRIGHT HOLDER
+# Copyright (C) 2007-2012 empathy's COPYRIGHT HOLDER
 # This file is distributed under the same license as the empathy package.
 # Takeshi AIHANA <takeshi.aihana@gmail.com>, 2007-2009.
 # Kentaro Kazuhama <kazken3@gmail.com>, 2009.
@@ -7,26 +7,41 @@
 # (Contributed to Moblin by Intel GLS)
 # Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2010.
 # Kiyotaka NISHIBORI <ml.nishibori.kiyotaka@gmail.com>, 2010.
+# Mako N <mako@pasero.net>, 2012.
 #
 # GLOSSARIES:
-#  contact list: 仲間リスト
-#  contact:      仲間
-#  away:         離席
-#  log(s) in:    サインイン
-#  log(s) out:   サインアウト
-#  chat room:    �ャット部屋
-#  chat window:  �ャットウィンドウ
-#  nick:         ニック�ーム
-#  nickname:     ニック�ーム
+# call	通話�呼�出��呼�出�
+# choose	��
+# select	指定�る
+# contact	相手先
+# contact list	相手先�一覧
+# metacontact	メタ相手先
+# chat	�ャット
+# conversation	会話
+# chat room	談話室
+# room	談話室
+# text	文字
+# audio	音声
+# video	ビデオ�映�
+# identifier	�称
+# status	在席状�
+# People Nearby	(訳���)
+# geolocation	�置情報
+# location	場所
+#
+# nick:    ニック�ーム
+# nickname:   ニック�ーム
+# log(s) in:    サインイン
+# log(s) out:   サインアウト
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-16 12:29+0000\n"
-"PO-Revision-Date: 2011-09-11 00:28+0900\n"
-"Last-Translator: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>\n"
+"POT-Creation-Date: 2012-02-08 14:20+0000\n"
+"PO-Revision-Date: 2012-02-08 20:43+0900\n"
+"Last-Translator: Mako N <mako@pasero.net>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,698 +50,680 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Googleトーク�Facebook�MSN や他�多���ャットサービス��ャット"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "インスタントメッセンジャー・クライアント"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
-msgstr "Empathy インスタント・メッセンジャー"
+msgstr "Empathy インスタントメッセージング"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "インスタント・メッセンジャー クライアント"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Googleトーク�Facebook�MSN や他�多���ャットサービス��ャット"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "新���ャット用�別��ャットウィンドウを常�開���。"
+msgid "Connection managers should be used"
+msgstr "接続マ�ージャーを利用�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
+"自動的�切断/�接続�る��接続マ�ージャーを利用�������を設定���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr ""
+msgid "Empathy should auto-connect on startup"
+msgstr "起動時�自動接続�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#, fuzzy
-#| msgid "Camera On"
-msgid "Camera device"
-msgstr "カメラ入"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Empathy を起動��ら自動的�自分�アカウント�サインイン�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-#, fuzzy
-#| msgid "Camera On"
-msgid "Camera position"
-msgstr "カメラ入"
+msgid "Empathy should auto-away when idle"
+msgstr "アイドル時�自動的�離席中��る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"グループ・�ャット�ニック�ームを補完(tab)��際��ニック�ーム�後��追加"
-"�る文字��。"
+"ユーザー�アイドル状態����ら�Empathy �自動的�離席中�モード��る��"
+"����。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "�ャットウィンドウ�テーマ"
+msgid "Empathy default download folder"
+msgstr "Empathy �使�デフォルト�ダウンロード・フォルダー"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-#, fuzzy
-#| msgid "Chat window theme"
-msgid "Chat window theme variant"
-msgstr "�ャットウィンドウ�テーマ"
+msgid "The default folder to save file transfers in."
+msgstr "転���ファイルを�存�るデフォルト�フォルダー��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"スペルを�ェック�る言語をコンマ�区切��指定��� (例: \"en, fr, nl\")。"
+msgid "Show offline contacts"
+msgstr "オフライン�相手先を表示�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "仲間リストを����る����"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "相手先�一覧�中�オフライン�相手先を表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "接続マ�ージャーを利用�る����"
+msgid "Show avatars"
+msgstr "ア�ターを表示�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "仲間リストを並�替�る際��件"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"相手先�一覧��ャットウィンドウ�中�相手先�ア�ターを表示�る�����"
+"�。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
+msgid "Show protocols"
+msgstr "プロトコルを表示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "ア�ター�画��格��れ�デフォルト�フォルダー"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "相手先�一覧�中�相手先�プロトコルを表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "離席中����も�ップアップ通知�������"
+#, fuzzy
+msgid "Show Balance in contact list"
+msgstr "相手先�一覧をコンパクト��る(_M)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "離席中����らサウンド�演�を無効��る����"
+#, fuzzy
+msgid "Whether to show account balances in the contact list."
+msgstr "相手先�一覧�中�相手先�プロトコルを表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "�信��イベントを表示"
+msgid "Compact contact list"
+msgstr "相手先�一覧を����る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"�信��イベントを通知領域�表示���。も� false �ら�ユーザー����通知"
-"���。"
+msgid "Whether to show the contact list in compact mode."
+msgstr "相手先�一覧を���表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr ""
+msgid "Hide main window"
+msgstr "メインウィンドウを隠�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathy�ユーザー�場所�公開を�能��る"
+msgid "Hide the main window."
+msgstr "メインウィンドウを隠�������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy�場所�推測�GPSを利用�る��を�能��る"
+msgid "Default directory to select an avatar image from"
+msgstr "ア�ター�画��格��れ�デフォルト�フォルダー"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy�場所�推測�セルラー�ットワークを利用�る��を�能��る"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "最後�ア�ターを�択��時�使用��フォルダー��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy�場所�推測��ットワークを利用�る��を�能��る"
+msgid "Open new chats in separate windows"
+msgstr "新���ャット���ウィンドウを開�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathy �使�デフォルト�ダウンロード・フォルダー"
+msgid "Always open a separate chat window for new chats."
+msgstr "常�新���ャット���別��ャットウィンドウを開���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy � butterfly �ログを移行����"
+msgid "Display incoming events in the status area"
+msgstr "�信��イベントを表示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "アイドル時�自動的�離席�る����"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"�信��イベントを通知領域�表示���。も� false �ら�ユーザー����通知"
+"���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "起動時�自動接続�る����"
+msgid "The position for the chat window side pane"
+msgstr "�ャットウィンドウ�横�ペイン��置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy�場所�精度を下�る����"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "�存�れ��ャットウィンドウ�横�ペイン��置 (ピクセル��)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "仲間リスト�ア�ターを�ャットウィンドウ�アイコン��る����"
+msgid "Contact list sort criterion"
+msgstr "相手先�一覧を並�替�る際��件"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "WebKit Developer Toolsを有効��る"
+#, fuzzy
+#| msgid ""
+#| "Which criterion to use when sorting the contact list. Default is to sort "
+#| "by the contact's name with the value \"name\". A value of \"state\" will "
+#| "sort the contact list by state."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"相手先�一覧�中�相手先を並�替�る際����件を使用�る�。デフォルト�相"
+"手先��� (\"name\") ��。\"state\" ��相手先�状態�相手先�一覧を並�替"
+"���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "メッセージを�信��ら�ップアップ�通知�る����"
+msgid "Use notification sounds"
+msgstr "通知�サウンドを使�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "スペルを�ェック�る����"
+msgid "Whether to play a sound to notify of events."
+msgstr "イベント�発生��らサウンドを�生��通知�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "メイン・ウィンドウを隠�����"
+msgid "Disable sounds when away"
+msgstr "離席中����サウンドを鳴ら���"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "メイン・ウィンドウを隠�������。"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "離席中����り込�中����サウンド通知を行�������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "ニックを補完�る文字"
+msgid "Play a sound for incoming messages"
+msgstr "メッセージを�信��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "新��会話毎�ウィンドウを開�����"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "メッセージを�����らサウンドを�生��通知�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "使用�る Adium テーマ�パス"
+msgid "Play a sound for outgoing messages"
+msgstr "メッセージを�信��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"会話�使用�るテーマ� Adium �場��使用�る Adium テーマ�パスを指定��"
-"�。"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "メッセージを�信��らサウンドを�生��通知�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "メッセージを�信��らサウンドを演��る����"
+msgid "Play a sound for new conversations"
+msgstr "�ャット�新��会話を��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "�ャット�新��会話を��らサウンドを演��る����"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "新��会話を開始��らサウンドを�生��通知�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
-msgstr "メッセージを�信��らサウンドを演��る����"
+msgid "Play a sound when a contact logs in"
+msgstr "相手先�サインイン��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "仲間�サインイン��らサウンドを演��る����"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"相手先�サインイン����を通知�る���サウンドを�生�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
-msgstr "仲間�サインアウト��らサウンドを演��る����"
+msgstr "相手先�サインアウト��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "サインイン��らサウンドを演��る����"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"相手先�サインアウト����を通知�る���サウンドを�生�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "サインアウト��らサウンドを演��る����"
+msgid "Play a sound when we log in"
+msgstr "サインイン��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr ""
-"�ャット・ウィンドウ�フォーカス�当������場���ップアップ通知�る"
+msgid "Whether to play a sound when logging into a network."
+msgstr "�ットワーク�サインイン��らサウンドを�生�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "仲間�サインイン��際��ップアップ通知"
+msgid "Play a sound when we log out"
+msgstr "サインアウト��らサウンドを鳴ら�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "仲間�サインアウト��際��ップアップ通知"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "�ットワーク�らサインアウト��らサウンドを�生�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr ""
+msgid "Enable popup notifications for new messages"
+msgstr "メッセージを�信��ら�ップアップ�通知�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-#, fuzzy
-#| msgid "Show co_mpact contact list"
-msgid "Show Balance in contact list"
-msgstr "仲間リストをコンパクト��る(_M)"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "新��メッセージを�信�る際���ップアップ通知�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "ア�ターを表示�る����"
+msgid "Disable popup notifications when away"
+msgstr "離席中�����ップアップ通知���"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "部屋�仲間�一覧を表示�る����"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "離席中����り込�中�����ップアップ通知を表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "メイン・ウィンドウを閉�る際�ヒントを表示�る����"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr ""
+"�ャットウィンドウ�フォーカス�当������場���ップアップ通知�る"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "オフライン�仲間を表示�る����"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"�ャットウィンドウ�開����もフォーカス�当������場��新��メッ"
+"セージを�信�る際��ップアップ通知を行�������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "プロトコルを表示"
+msgid "Pop up notifications when a contact logs in"
+msgstr "相手先�サインイン��際��ップアップ通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "スペルを�ェック�る言語"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "相手先�オンライン����際��ップアップ通知を表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "転���ファイルを�存�るデフォルト�フォルダー��。"
+msgid "Pop up notifications when a contact logs out"
+msgstr "相手先�サインアウト��際��ップアップ通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "最後�ア�ターを�択��時�使用��フォルダー��。"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "相手先�オフライン����際��ップアップ通知を表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "�ャットウィンドウ�横�ペイン��置"
+msgid "Use graphical smileys"
+msgstr "スマイリー・アイコンを使�����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "�存�れ��ャットウィンドウ�横�ペイン��置 (ピクセル��)"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "会話中�スマイリーをグラフィカル�画��変��る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "�ャットウィンドウ�使用�るテーマ��。"
+msgid "Show contact list in rooms"
+msgstr "談話室�相手先�一覧を表示�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-#, fuzzy
-#| msgid "The theme that is used to display the conversation in chat windows."
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "�ャットウィンドウ�使用�るテーマ��。"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "談話室�相手先�一覧を表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
-msgstr "スマイリー・アイコンを使�����"
+msgid "Chat window theme"
+msgstr "�ャットウィンドウ�テーマ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "状態をサウンド�演��通知�る����"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "�ャットウィンドウ�使用�るテーマ��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "�ャットルーム�テーマを�用�る����"
+#, fuzzy
+msgid "Chat window theme variant"
+msgstr "�ャットウィンドウ�テーマ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy�仲間�場所を公開�る����を設定���。"
+#, fuzzy
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "�ャットウィンドウ�使用�るテーマ��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Empathy�GPS�場所を推測�る����を設定���。"
+msgid "Path of the Adium theme to use"
+msgstr "使用�る Adium テーマ�パス"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Empathy�セルラー�ットワーク�場所を推測�る����を設定���。"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"�ャット�使用�るテーマ� Adium �場��使用�る Adium テーマ�パスを指定�"
+"��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Empathy��ットワーク�場所を推測�る����を設定���。"
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit Developer Tools を有効��る"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empathy � butterfly �ログを移行������。"
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Web Inspector �よ�� WebKit developer tools を有効��る����。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Empathy を起動��ら自動的�自分�アカウント�サインイン�る������。"
+msgid "Use theme for chat rooms"
+msgstr "談話室�テーマを�用�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "アイドル状態����ら�Empathy �自動的�離席�る������。"
+msgid "Whether to use the theme for chat rooms."
+msgstr "談話室�テーマを使用�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Empathy�プライ�シー��由�場所�精度を下�る����を設定���。"
+msgid "Spell checking languages"
+msgstr "スペルを�ェック�る言語"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Empathy �仲間�ア�ターを�ャットウィンドウ�アイコン���利用�る����"
-"��。"
+"スペルを�ェック�る言語をコンマ�区切��指定��� (例: \"en, fr, nl\")。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Web Inspector�よ��WebKit developer toolsを有効��る����。"
+msgid "Enable spell checker"
+msgstr "スペルを�ェック�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"自動的�切断/�接続�る��接続マ�ージャーを利用�������を設定���。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "指定��言語�入力���語を�ェック�る������。"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Nick completed character"
+msgstr "ニック�ームを補完�る文字"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "会話中�スマイリーをグラフィカル�画��変��る������。"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"グループ�ャット�ニック�ームを補完(tab)��際��ニック�ーム�後��追加�"
+"る文字��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr ""
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "相手先�一覧�ア�ターを�ャットウィンドウ�アイコン��る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
-"仲間�サインイン����を通知�る���サウンドを�生�る������。"
+"Empathy �相手先�ア�ターを�ャットウィンドウ�アイコン���利用�る���"
+"���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
+msgid "Last account selected in Join Room dialog"
 msgstr ""
-"仲間�サインアウト����を通知�る���サウンドを�生�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "イベント�発生��らサウンドを�生��通知�る������。"
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "メッセージを�����らサウンドを�生��通知�る������。"
+msgid "Camera device"
+msgstr "カメラデ�イス"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "新��会話を開始��らサウンドを�生��通知�る������。"
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "ビデオ通話�使用�るデフォルト�カメラデ�イス。���� /dev/video0"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "メッセージを�信��らサウンドを�生��通知�る������。"
+msgid "Camera position"
+msgstr "カメラ��置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "�ットワーク�サインイン��らサウンドを�生�る������。"
+msgid "Position the camera preview should be during a call."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "�ットワーク�らサインアウト��らサウンドを�生�る������。"
+msgid "Echo cancellation support"
+msgstr "エコー除去�サ�ート"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "離席中���多忙����らサウンド��生�よる通知を行�������。"
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Pulseaudio �エコー除去フィルターを有効��る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"仲間�オフライン����際��ップアップ��通知を表示�る������。"
+msgid "Show hint about closing the main window"
+msgstr "メインウィンドウを閉�る際�ヒントを表示�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"仲間�オンライン����際��ップアップ��通知を表示�る������。"
+"タイトル�ー��る 'x' ボタンをクリック��メインウィンドウを閉��らメッセー"
+"ジ・ダイアログを表示�る������。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"�ャット・ウィンドウ�開����もフォーカス�当������れ��新��メッ"
-"セージを�信�る度��ップアップ通知を行�������。"
+msgid "Empathy can publish the user's location"
+msgstr "Empathy �ユーザー�場所�公開を�能��る"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "新��メッセージを�信�る度��ップアップ通知�る������。"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Empathy �相手先�場所を公開�る����を設定���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-#, fuzzy
-#| msgid "Whether to show protocols for contacts in the contact list."
-msgid "Whether to show account balances in the contact list."
-msgstr "仲間リスト�中�仲間�プロトコルを表示�る������。"
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy �場所�推測��ットワークを利用�る��を�能��る"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"仲間リスト��ャットウィンドウ�中�仲間�ア�ターを表示�る������。"
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy ��ットワーク�場所を推測�る����を設定���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "仲間リスト�中�オフライン�仲間を表示�る������。"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy �場所�推測�セルラー�ットワークを利用�る��を�能��る"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"状態�離席中���多忙����も�ップアップ通知を表示�る������。"
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy �セルラー�ットワーク�場所を推測�る����を設定���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "仲間リスト�中�仲間�プロトコルを表示�る������。"
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy �場所�推測� GPS を利用�る��を�能��る"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "�ャットルーム�仲間リストを表示�る������。"
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy � GPS �場所を推測�る����を設定���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "仲間リストを���表示�る������。"
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy �場所�精度を下�る����"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"タイトル�ー��る 'x' ボタンをクリック��メインウィンドウを閉��らメッセー"
-"ジ・ダイアログを表示�る������。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "�ャットルーム�テーマを使用�る������。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"仲間リスト�中�仲間を並�替�る際����件を使用�る�。デフォルト�仲間�"
-"�� (\"name\") ��。\"state\" ��仲間�状態�仲間リストを並�替���。"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Empathy �プライ�シー��由�場所�精度を下�る����を設定���。"
 
+#. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2327
+msgid "Messaging and VoIP Accounts"
+msgstr "メッセージング� VoIP �アカウント"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
 msgid "Manage Messaging and VoIP accounts"
 msgstr "メッセージング� VoIP �アカウント�管�"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "メッセージング� VoIP �アカウント"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "原因�特定�れ����ん"
 
-#: ../libempathy/empathy-ft-handler.c:825
-#, fuzzy
-#| msgid "File transfer completed"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "状態�変更を�求�れ���"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "ファイル転�をキャンセル����"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "他�相手先�ファイル転�をキャンセル����"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "ファイル�転�中�エラー�発生����"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "他�相手先�ファイル転�����ん���"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "原因�明��"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
-msgstr "ファイル�転��完了����"
+msgstr "ファイル�転��完了����。���ファイル�壊れ����"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "リモート��相手�ファイル転�をサ�ート�����ん。"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "�択��ファイル�一般的�ファイル���り��ん"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "�択�れ�ファイル�空��"
 
 #: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
+#, c-format
 msgid "Missed call from %s"
-msgstr "%s �ん�ら�呼�出���"
+msgstr "%s �ん�ら�失敗��通話"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
 #: ../libempathy/empathy-message.c:419
 #, fuzzy, c-format
-#| msgid "Call with %s"
 msgid "Called %s"
-msgstr "%s�発信"
+msgstr "%s �ん��通話"
 
 #: ../libempathy/empathy-message.c:422
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
+#, c-format
 msgid "Call from %s"
-msgstr "%s �ん�ら�呼�出���"
-
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "サ�ート�れ����ソケットタイプ��"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "原因�特定�れ����ん"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "状態�変更を�求�れ���"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "ファイル転�をキャンセル����"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "他�仲間�ファイル転�をキャンセル����"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "ファイル�転�中�エラー�発生����"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "他�仲間�ファイル転�����ん���"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "原因�明��"
+msgstr "%s �ん�ら�通話"
 
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "在席中"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "�り込�中"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "離席中"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
-msgstr "�表示"
+msgstr "隠れ中"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "オフライン"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
-#, fuzzy
-#| msgid "Unknown"
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�明"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "原因�特定�れ����ん"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
-msgstr "状態�オフライン�設定�れ����"
+msgstr "在席状��オフライン�設定�れ����"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "�ットワーク�エラー��"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "�証�失敗����"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "暗�化�エラー��"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
-msgstr "使用中���"
+msgstr "���使用中��"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "証明書��り��ん"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "信用���証明書��"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "証明書�有効期��切れ����"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "証明書�利用����ん"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "証明書�ホスト��一致���ん"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "証明書�指紋�一致���ん"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "証明書自身�署���"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "証明書�関連�るエラー��"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "暗��利用����ん"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "証明書�正���り��ん"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "接続�拒��れ���"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "接続を確立����ん���"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "接続�失�れ���"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "��リソース�既�サー�ー�接続済���"
+#: ../libempathy/empathy-utils.c:355
+#, fuzzy
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "��リソース����サー�ー�接続済���"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
-msgstr "接続���リソースを使��新��接続�置���り���"
+msgstr "接続���リソースを使�新��接続�置���り���"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
-msgstr "アカウント�サー�ー�既�存在�����"
+msgstr "アカウント�サー�ー����存在�����"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "サー�ー���接続を処������ら��忙��状態��り��"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "証明書�無効化�れ���"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "証明書�安全���暗��アルゴリズムを使���る��暗�的�弱���"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -734,288 +731,260 @@ msgstr ""
 "サー�ー証明書�長�や�サー�ー証明書��ェイン�深��暗�ライブラリ��定"
 "�れ��る長�を越�����"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "ソフトウェア������"
+
+#: ../libempathy/empathy-utils.c:375
+#, fuzzy
+#| msgid "Interval (seconds)"
+msgid "Internal error"
+msgstr "間隔 (秒)"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
-msgstr "��近���る人�"
+msgstr "People Nearby"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
-msgstr ""
+msgstr "Google トーク"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒�"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分�"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 時間�"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 日�"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 週間�"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ヶ月�"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "未��"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
-#, fuzzy
-#| msgid "Accounts"
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
-msgstr "アカウント"
+msgstr "����アカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "アカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "パスワード"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "サー�ー"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "�ート番�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-#, fuzzy
-#| msgid "Empathy Accounts"
-msgid "My Web Accounts"
-msgstr "Empathy �アカウント"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-#, fuzzy
-#| msgid "Empathy Accounts"
-msgid "Launch My Web Accounts"
-msgstr "Empathy �アカウント"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, fuzzy, c-format
-#| msgid "_Edit"
-msgid "Edit %s"
-msgstr "編集(_E)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "ユーザー�:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "�用(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "ログイン(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "��アカウント����サー�ー�存在���"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "サー�ー�新��アカウントを作る"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "中止(_N)"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ��る %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s アカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "新��アカウント"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>例:</b> MyScreenName"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "パスワード(_W):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "詳細"
+msgid "Screen _Name:"
+msgstr "スクリーン�(_N):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>例:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "パスワード(_W):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "パスワードを記憶�る"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-#, fuzzy
-#| msgid "Password"
-msgid "Remember Password"
-msgstr "パスワード"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "�ート番�(_P):"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "スクリーン�(_N):"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "サー�ー(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "AIM�パスワードを入力������"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "詳細"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
-msgstr "AIM�スクリーン�ームを入力������"
+msgstr "AIM �スクリーン�ームを入力������"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "�ート番�(_P):"
+msgid "What is your AIM password?"
+msgstr "AIM�パスワードを入力������"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "サー�ー(_S):"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>例:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "パスワードを記憶�る"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "ログイン�(_D):"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-msgid "What is your GroupWise User ID?"
-msgstr "GroupWise�User IDを入力������"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>例:</b> username"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+msgid "What is your GroupWise User ID?"
+msgstr "GroupWise � User ID を入力������"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
-msgstr "GroupWise�パスワードを入力������"
+msgstr "GroupWise �パスワードを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ UIN(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>例:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "文字集�(_A):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ UIN(_U):"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
-msgstr "ICQ UINを入力������"
+msgstr "ICQ UIN を入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
-msgstr "ICQ�パスワードを入力������"
+msgstr "ICQ �パスワードを入力������"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:206
 #: ../libempathy-gtk/empathy-account-widget-sip.c:239
@@ -1050,23 +1019,30 @@ msgstr "Options"
 msgid "None"
 msgstr "��"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "�ットワーク"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "文字集�:"
+msgid "Network:"
+msgstr "�ットワーク:"
 
+# 元�語�よら��「文字エンコーディング��訳�(ヘルプ�対応�る項も�照)。
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
+msgid "Character set:"
+msgstr "文字エンコーディング:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "�ットワーク"
+msgid "Servers"
+msgstr "サー�ー"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "�ットワーク:"
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"����� IRC サー�ー���パスワード�����。��ら��れ��パスワード"
+"を入力��������。"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -1084,48 +1060,20 @@ msgstr "終了時�メッセージ:"
 msgid "Real name:"
 msgstr "��:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "サー�ー"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "IRC �ニック�ーム�何���?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "�� IRC �ットワーク���?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>例:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>例:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "TLS/SSL ��暗�化�必�(_Y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL�証明書�関連�るエラー�無視(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "サー�ー�設定を上書��る"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "優先度(_T):"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "IRC �ニック�ーム�何���?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "リソース(_U):"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "���� Facebook �ユーザー��何���?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1139,178 +1087,202 @@ msgstr ""
 "�����������れ��<a href=\"http://www.facebook.com/username/\">�"
 "�ページ</a>を使�� Facebook �ユーザー�を�択������。"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "�� SSL を使�(_L)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "���� Facebook �パスワード�何���?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "���� Facebook �ユーザー��何���?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
-msgstr "Google IDを入力������"
+msgstr "Google ID を入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>例:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
-msgstr "Google�パスワードを入力������"
+msgstr "Google �パスワードを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "What is your Jabber ID?"
-msgstr "Jabber IDを入力������"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>例:</b> user@jabber.org"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Jabberパスワードを入力������"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL �証明書�関連�るエラー�無視(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "優先度(_T):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "リソース(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "TLS/SSL ��暗�化�必�(_Y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "�� SSL を使�(_L)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "サー�ー�設定を上書�"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your desired Jabber ID?"
-msgstr "希望�るJabber IDを入力������"
+msgid "What is your Jabber ID?"
+msgstr "Jabber ID を入力������"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+msgid "What is your desired Jabber ID?"
+msgstr "希望�る Jabber ID を入力������"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Jabber パスワードを入力������"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
-msgstr "希望�るJabberパスワードを入力������"
+msgstr "希望�る Jabber パスワードを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>例:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
-msgstr "���� Windows Live ID �何���?"
+msgstr "Windows Live ID を入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Windows Live �パスワードを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-メールアドレス(_M):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "ニック�ーム(_K):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "姓(_L):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "��(_F):"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "公称(_P):"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Jabber ID(_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "�字(_L):"
+msgid "E-_mail address:"
+msgstr "E-メールアドレス(_M):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "公称(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "ユーザー�(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>例:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "�証用ユーザー�:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "�インディング�探索"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "STUN サー�ーを自動的�探索�る"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr ""
+msgid "NAT Traversal Options"
+msgstr "NAT 超�オプション"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "間隔 (秒)"
+msgid "Proxy Options"
+msgstr "プロキシ�オプション"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive オプション"
+msgid "Miscellaneous Options"
+msgstr "��他�オプション"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "緩�ルーティング"
+msgid "STUN Server:"
+msgstr "STUN サー�ー:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "メカニズム:"
+msgid "Discover the STUN server automatically"
+msgstr "STUN サー�ーを自動的�探索�る"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "��他�オプション"
+msgid "Discover Binding"
+msgstr "�インディング�探索"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT 超�オプション"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "サー�ー:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive オプション"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "�ート番�:"
+msgid "Mechanism:"
+msgstr "メカニズム:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "プロキシ�オプション"
+msgid "Interval (seconds)"
+msgstr "間隔 (秒)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "�証用ユーザー�:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "トランス�ート:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN サー�ー:"
+msgid "Loose Routing"
+msgstr "緩�ルーティング"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "サー�ー:"
+msgid "Ignore TLS Errors"
+msgstr "TLS エラーを無視�る"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "トランス�ート:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
+msgid "Port:"
+msgstr "�ート番�:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "SIPアカウント�パスワードを入力������"
+msgid "What is your SIP login ID?"
+msgstr "SIP �ログイン ID を入力������"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "What is your SIP login ID?"
-msgstr "SIP�ログインIDを入力������"
+msgid "What is your SIP account password?"
+msgstr "SIP アカウント�パスワードを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "ユーザー�(_U):"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! � ID(_D):"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
-msgstr "会議��ャットルーム��勧誘を無視(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "What is your Yahoo! ID?"
-msgstr "Yahoo! IDを入力������"
+msgstr "会議�談話室��招待を無視(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "What is your Yahoo! password?"
-msgstr "Yahoo!�パスワードを入力������"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "談話室�一覧��る場所(_R):"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! � ID(_D):"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "What is your Yahoo! ID?"
+msgstr "Yahoo! ID を入力������"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "部屋�一覧��る場所(_R):"
+msgid "What is your Yahoo! password?"
+msgstr "Yahoo! �パスワードを入力������"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
@@ -1322,10 +1294,8 @@ msgid "None of the accepted image formats are supported on your system"
 msgstr "�付られ�画��形����使��システム�サ�ート�れ����ん"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:819
-#, fuzzy
-#| msgid "Couldn't convert image"
 msgid "Couldn't save picture to file"
-msgstr "画�を変�����ん���"
+msgstr "画�をファイル��存����ん���"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
@@ -1352,105 +1322,100 @@ msgid "Click to enlarge"
 msgstr "クリック�る�大���り��"
 
 #: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:60
-#, fuzzy
-#| msgid "There was an error while creating the account."
+#: ../libempathy-gtk/empathy-call-utils.c:62
 msgid "There was an error starting the call"
-msgstr "アカウント�作�中�エラー�発生����。"
+msgstr "呼�出�中�エラー�発生����。"
 
 #: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact doesn't support calls"
-msgstr ""
+msgstr "�択��相手先�通話をサ�ート�����ん"
 
 #: ../libempathy-gtk/empathy-call-utils.c:53
-#, fuzzy
-#| msgid "The selected contact is offline."
 msgid "The specified contact is offline"
-msgstr "�択��仲間�オフライン��。"
+msgstr "�択��相手先�オフライン��"
 
 #: ../libempathy-gtk/empathy-call-utils.c:55
-#, fuzzy
-#| msgid "The selected contact is offline."
 msgid "The specified contact is not valid"
-msgstr "�択��仲間�オフライン��。"
+msgstr "�択��相手先�有効���り��ん"
 
 #: ../libempathy-gtk/empathy-call-utils.c:57
-#, fuzzy
-#| msgid "Topic not supported on this conversation"
 msgid "Emergency calls are not supported on this protocol"
-msgstr "��会話��トピック�サ�ート�れ����ん"
+msgstr "��プロトコル�緊急呼�出�をサ�ート�����ん"
+
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "��通話を行���クレジット��足�����"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:710
 msgid "Failed to open private chat"
 msgstr "プライベート��ャットを開���ん���"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:768
 msgid "Topic not supported on this conversation"
 msgstr "��会話��トピック�サ�ート�れ����ん"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:774
 msgid "You are not allowed to change the topic"
 msgstr "トピック�変更�許��れ����ん"
 
 #: ../libempathy-gtk/empathy-chat.c:973
-#, fuzzy, c-format
-#| msgid "invalid contact"
+#, c-format
 msgid "“%s� is not a valid contact ID"
-msgstr "無効�仲間��"
+msgstr "“%s� �無効�相手先 ID ��"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: �在�会話�ら����メッセージをクリア"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <トピック>: �在�会話�トピックを設定"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/join <chat room ID>: join a new chat room"
-msgstr "/join <�ャットルームID>: 新���ャットルーム��加"
+msgstr "/join <談話室ID>: 新��談話室��加"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/j <chat room ID>: join a new chat room"
-msgstr "/j <�ャットルームID>: 新���ャットルーム��加"
+msgstr "/j <談話室ID>: 新��談話室��加"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
-msgstr ""
+msgstr "/part [<談話室ID>] [<�由>]: 談話室(デフォルト���在�談話室)を退出"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <コンタクトID> [<メッセージ>]: プライベート��ャットを開始"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <コンタクトID> <メッセージ>: プライベート��ャットを開始"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <ニック�ーム>: �在�サー�ー������ニック�ームを変更"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <メッセージ>: ACTION メッセージを�在�会話��る"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 "/say <メッセージ>: <メッセージ> を�在�会話��り込む。�れ� '/' �始�る"
-"メッセージを�信�る時�使�れ��。例: \"/say /join �新���ャットルーム�"
-"�加�る��使���\""
+"メッセージを�信�る時�使�れ��。例: \"/say /join �新��談話室��加�る"
+"��使���\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid "/whois <contact ID>: display information about a contact"
-msgstr ""
+msgstr "/whois <相手先ID>: 相手先�����情報を表示"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1105
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1458,165 +1423,178 @@ msgstr ""
 "/help [<コマンド>]: サ�ート�れ��るコマンド���を表示。<コマンド> を指定"
 "��ら���使用方法を表示"
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1124
 #, c-format
 msgid "Usage: %s"
 msgstr "使�方: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1169
 msgid "Unknown command"
 msgstr "�明�コマンド"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1295
 msgid "Unknown command; see /help for the available commands"
 msgstr "�明�コマンド���/help �利用�能�コマンドを表示������"
 
+#: ../libempathy-gtk/empathy-chat.c:1541
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1622
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "'%s' ���メッセージを�信�る際�エラー: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564
+#: ../libempathy-gtk/empathy-chat.c:1626
+#, c-format
+msgid "Error sending message: %s"
+msgstr "メッセージを�信�る際�エラー: %s"
+
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
-msgid "insufficient balance to send message"
+#: ../libempathy-gtk/empathy-chat.c:1553
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1593
 msgid "not capable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1600
 msgid "offline"
 msgstr "オフライン"
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "invalid contact"
-msgstr "無効�仲間��"
+msgstr "無効�相手先��"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "permission denied"
 msgstr "権���り��ん"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "too long message"
 msgstr "メッセージ�長����"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "not implemented"
 msgstr "未実装��"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "unknown"
 msgstr "原因�明��"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "'%s' ���メッセージを�信�る際�エラー: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, fuzzy, c-format
-#| msgid "Error sending message '%s': %s"
-msgid "Error sending message: %s"
-msgstr "'%s' ���メッセージを�信�る際�エラー: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "トピック:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
 msgid "Topic set to: %s"
 msgstr "新��トピック: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1700
+#, fuzzy, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr "新��トピック: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1705
 msgid "No topic defined"
 msgstr "トピック��り��ん"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2221
 msgid "(No Suggestions)"
 msgstr "(�案��)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2289
 #, c-format
 msgid "Add '%s' to Dictionary"
-msgstr ""
+msgstr "'%s' を辞書�追加�る"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2326
 #, c-format
 msgid "Add '%s' to %s Dictionary"
-msgstr ""
+msgstr "'%s' を %s �辞書�追加�る"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2396
 msgid "Insert Smiley"
 msgstr "スマイリー�挿入"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2414
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "�信(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2471
 msgid "_Spelling Suggestions"
 msgstr "スペル��案(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2560
 msgid "Failed to retrieve recent logs"
 msgstr "最近�ログ��得�失敗����"
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2699
 #, c-format
 msgid "%s has disconnected"
-msgstr "%s �切断�れ���"
+msgstr "%s �切断����"
 
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2706
 #, c-format
 msgid "%1$s was kicked by %2$s"
-msgstr "%1$s � %2$s �kick�れ���"
+msgstr "%1$s � %2$s � kick �れ���"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2709
 #, c-format
 msgid "%s was kicked"
-msgstr "%s �kick�れ���"
+msgstr "%s � kick �れ���"
 
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2717
 #, c-format
 msgid "%1$s was banned by %2$s"
-msgstr "%1$s � %2$s �BAN�れ���"
+msgstr "%1$s � %2$s � BAN �れ���"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2720
 #, c-format
 msgid "%s was banned"
-msgstr "%s �BAN�れ���"
+msgstr "%s � BAN �れ���"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2724
 #, c-format
 msgid "%s has left the room"
-msgstr "%s �ん�部屋�ら退室����"
+msgstr "%s �ん�談話室�ら退出����"
 
 #. Note to translators: this string is appended to
 #. * notifications like "foo has left the room", with the message
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2758
 #, c-format
 msgid "%s has joined the room"
-msgstr "%s �ん�部屋�入室����"
+msgstr "%s �ん�談話室��加����"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2783
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s � %s ��り���"
@@ -1624,731 +1602,676 @@ msgstr "%s � %s ��り���"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../libempathy-gtk/empathy-chat.c:2970
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
 msgid "Disconnected"
 msgstr "�通"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "Would you like to store this password?"
-msgstr ""
+msgstr "パスワードを�存����?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
-#, fuzzy
-#| msgid "Members"
+#: ../libempathy-gtk/empathy-chat.c:3640
 msgid "Remember"
-msgstr "メン�ー"
+msgstr "記憶�る"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3650
 msgid "Not now"
-msgstr ""
+msgstr "今����"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3694
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "�挑戦"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3698
 msgid "Wrong password; please try again:"
 msgstr "パスワード�間��������度挑戦������:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3828
 msgid "This room is protected by a password:"
-msgstr "��部屋�パスワード��護�れ����:"
+msgstr "��談話室�パスワード��護�れ����:"
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3855
 msgid "Join"
-msgstr "入室�る"
+msgstr "�加�る"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "オンライン"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4102
 msgid "Conversation"
 msgstr "会話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
-#, fuzzy, c-format
-#| msgid "%s (%s)"
+#: ../libempathy-gtk/empathy-chat.c:4107
+#, c-format
 msgid "%s (SMS)"
-msgstr "%s (%s)"
+msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
-#, fuzzy
-#| msgid "permission denied"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "権���り��ん"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
-msgstr ""
+msgstr "相手先をブロック����ん"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
-#, fuzzy
-#| msgid "Linked Contacts"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
-msgstr "リンク中�仲間"
+msgstr "ブロック�る相手先�編集"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "アカウント:"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
-#, fuzzy
-#| msgid "Linked Contacts"
 msgid "Blocked Contacts"
-msgstr "リンク中�仲間"
+msgstr "ブロック中�相手先"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
-#, fuzzy
-#| msgid "_Remove"
 msgid "Remove"
-msgstr "削除(_R)"
+msgstr "削除"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "リンク先�コピー(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "リンクを開�(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
-msgstr "%Yå¹´%B%eæ—¥ %A"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "仲間情報�編集"
+msgstr "%Yå¹´%b%eæ—¥ %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "個人�情報"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
-msgstr "新��仲間"
+msgstr "新��相手先"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
-msgstr ""
+msgstr "%s をブロック����?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr ""
+msgstr "�ん���今後 '%s' �ら�連絡をブロック����?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
-msgstr ""
+msgstr "ブロック(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
-msgstr[0] ""
+msgstr[0] "��相手先を�快・��切���通報�る(_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "���決�る(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "登録�リクエスト"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "グループ無所属"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "�気�入り�人�"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "本当� '%s' ���グループを削除����?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "グループ�削除"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "削除(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "本当� '%s' ���仲間を削除����?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "仲間�削除"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "仲間�追加(_A)…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-#, fuzzy
-#| msgid "_Contact"
-msgid "_Block Contact"
-msgstr "仲間(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "会話(_C)"
+msgstr "相手先�ブロック(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "音声�会話(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "映��会話(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "会話�履歴(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "ファイル��信"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "デスクトップを共有�る"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "�気�入り"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "情報(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "編集(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "��部屋�招待���"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "�ャットルーム�招待�る(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "���決�る(_L)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
-#, fuzzy
-#| msgid "Select a contact"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
-msgstr "連絡先��択"
+msgstr "相手先�検索"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
-#, fuzzy
-#| msgid "Search"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
-msgstr "検索"
+msgstr "検索:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
-#, fuzzy
-#| msgid "_Add Contact…"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
-msgstr "仲間�追加(_A)…"
+msgstr "相手先を追加(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
-#, fuzzy
-#| msgid "No match found"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
-msgstr "見��り��ん���"
+msgstr "相手先�見��り��ん���"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
-msgstr ""
+msgstr "自己紹介�メッセージ:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "連絡先��択"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "��:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "電話番�:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-メールアドレス:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "ウェブサイト:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "誕生日:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-#, fuzzy
-#| msgid "_Last Name:"
-msgid "Last seen:"
-msgstr "�字(_L):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-#, fuzzy
-#| msgid "Connected"
-msgid "Connected from:"
-msgstr "オンライン"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-#, fuzzy
-#| msgid "Quit message:"
-msgid "Away message:"
-msgstr "終了時�メッセージ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:568
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 #, fuzzy
-#| msgid "Ca_ncel"
 msgid "Channels:"
 msgstr "中止(_N)"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:748
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
-msgstr "ISO�よる国コード:"
+msgstr "ISO �よる国コード:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:750
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "国:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:752
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "連邦・州:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:754
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "都市:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:756
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "地域:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "郵便番�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:760
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "通り:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "ビル:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "階:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "部屋番�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "テキスト:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "説明:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "精度�レベル:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "エラー:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "垂直誤差 (メートル):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (メートル):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "速度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "方�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "上昇速度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "最後�アップデート�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "経度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:794
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "高度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:847
+#: ../libempathy-gtk/empathy-contact-widget.c:862
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "場所"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:864
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:916
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
-msgstr "%Yå¹´%B%eæ—¥ %R UTC"
+msgstr "%Yå¹´%b%eæ—¥ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:998
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "ア�ター��存"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1054
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "ア�ターを�存����ん"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>場所</b> � (date)\t"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "��:"
 
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "別�:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "電話番�"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "クライアント情報"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-メールアドレス"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "クライアント:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "ウェブサイト"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "仲間�詳細"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "誕生日"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#, fuzzy
+msgid "Last seen:"
+msgstr "�字(_L):"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+#, fuzzy
+msgid "Connected from:"
+msgstr "オンライン"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "離席時�メッセージ:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#, fuzzy
+msgid "work"
+msgstr "仕事"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#, fuzzy
+msgid "home"
+msgstr "自宅"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#, fuzzy
+msgid "mobile"
+msgstr "モ�イル"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#, fuzzy
+msgid "voice"
+msgstr "音声"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#, fuzzy
+msgid "preferred"
+msgstr "設定"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#, fuzzy
+msgid "parcel"
+msgstr "外観"
 
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
-msgstr "スクリーン�:"
+msgstr "�称:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "別�:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>場所</b> � (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "相手先�詳細"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "情報��得中…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "クライアント情報"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "�ージョン:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "クライアント:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "グループ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
-"��仲間を登録�るグループを�択������ (1�以上�グループを�択��り�"
-"�る��全��択����も構���ん)"
+"��相手先を登録�るグループを�択������ (2�以上�グループを�択��"
+"り��る��全��択����も構���ん)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "グループ�追加(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 #, fuzzy
-#| msgid "Select"
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "�択"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1951
 msgid "Group"
 msgstr "グループ"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
-msgstr[0] ""
+msgstr[0] "以下� ID をブロック���:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
-msgstr[0] ""
-
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "リンク中�仲間"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "リンク�る連絡先��択"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "新��仲間をプレビュー"
+msgstr[0] "以下� ID �ブロック����ん:"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "左�一覧��択��仲間�互��リンク�����"
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "相手先情報�編集"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr ""
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "発信"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 #, fuzzy
-#| msgid "File"
 msgid "Mobile"
-msgstr "ファイル"
+msgstr "モ�イル"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 #, fuzzy
-#| msgid "Word"
 msgid "Work"
-msgstr "�語"
+msgstr "仕事"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
-msgstr ""
+msgstr "自宅"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "相手先をブロック(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "�ャット(_C)"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "音声通話(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "ビデオ通話(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "会話�履歴(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "ファイル��信"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "デスクトップを共有�る"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "�気�入り"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#, fuzzy
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "telepathy-salut �インストール�れ����ん"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1377
+msgid "Infor_mation"
+msgstr "情報(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "仲間をリンク(_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1543
+#: ../src/empathy-chat-window.c:1166
+msgid "Inviting you to this room"
+msgstr "��談話室�招待���"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1589
+msgid "_Invite to Chat Room"
+msgstr "談話室�招待�る(_I)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1785
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "相手先を追加(_A)…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
-msgstr ""
+msgstr "削除��ブロック(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "本当� '%s' ���グループを削除����?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "グループ�削除"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "削除(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "本当� '%s' ���相手先を削除����?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
-#, fuzzy, c-format
-#| msgid "Meta-contact containing %u contact"
-#| msgid_plural "Meta-contact containing %u contacts"
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "相手先�削除"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] "%u 人�仲間を�むメタコンタクト"
+msgstr[0] "%u 人�相手先を�むメタ相手先"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
 msgstr "(date) � <b>場所</b>"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "新���ットワーク"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "IRC �ットワークを�択"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
-msgstr ""
+msgstr "�ットワーク�一覧をリセット(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 #, fuzzy
-#| msgid "Select"
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "�択"
@@ -2361,290 +2284,258 @@ msgstr "新��サー�ー"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "仲間�接続"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "リンクを外�(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-#, fuzzy
-#| msgid ""
-#| "Completely split the displayed meta-contact into the contacts it contains."
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "メタコンタクトをメタコンタクト��ん��る仲間�完全�分割���。"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "リンク(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, fuzzy, c-format
-#| msgid "Unlink meta-contact '%s'?"
-msgid "Unlink linked contacts '%s'?"
-msgstr "メタコンタクト '%s' �リンクを外����?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-#, fuzzy
-#| msgid ""
-#| "Are you sure you want to unlink this meta-contact? This will completely "
-#| "split the meta-contact into the contacts it contains."
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"��メタコンタクト�リンクを外������? メタコンタクトを��れ��ん�る"
-"仲間�完全�分割�る����り��。"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "リンクを外�(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
-msgstr ""
+msgstr "表示"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "検索"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
-#, fuzzy, c-format
-#| msgid "Call with %s"
+#: ../libempathy-gtk/empathy-log-window.c:1150
+#, c-format
 msgid "Chat in %s"
-msgstr "%s�発信"
+msgstr "%s ��ャット"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
-#, fuzzy, c-format
-#| msgid "Call with %s"
+#: ../libempathy-gtk/empathy-log-window.c:1152
+#, c-format
 msgid "Chat with %s"
-msgstr "%s�発信"
+msgstr "%s ��ャット"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
-#, fuzzy
-#| msgid "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
-msgstr "%Yå¹´%B%eæ—¥ %A"
+msgstr "%Yå¹´%b%eæ—¥ %A %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr ""
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
-#, fuzzy, c-format
-#| msgid "<b>Topic:</b>"
+#: ../libempathy-gtk/empathy-log-window.c:1297
+#, c-format
 msgid "<b>%s:</b> %s"
-msgstr "<b>トピック:</b>"
+msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
-#, fuzzy, c-format
-#| msgid "%d second ago"
-#| msgid_plural "%d seconds ago"
+#: ../libempathy-gtk/empathy-log-window.c:1373
+#, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
-msgstr[0] "%d 秒�"
+msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
-#, fuzzy, c-format
-#| msgid "%d minute ago"
-#| msgid_plural "%d minutes ago"
+#: ../libempathy-gtk/empathy-log-window.c:1380
+#, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
-msgstr[0] "%d 分�"
+msgstr[0] "%s 分"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
-msgstr ""
+msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
-#, fuzzy
-#| msgid "Western"
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
-msgstr "西欧"
+msgstr "昨日"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
-#, fuzzy
-#| msgid "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
-msgstr "%Yå¹´%B%eæ—¥ %A"
+msgstr "%Yå¹´%b%eæ—¥"
 
 #: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
-msgstr ""
+msgstr "���"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
-#, fuzzy
-#| msgid "None"
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
-msgstr "��"
+msgstr "���"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
-msgstr ""
+msgstr "相手先���談話室"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
-msgstr ""
+msgstr "日付"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
-msgstr ""
+msgstr "���"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
-#, fuzzy
-#| msgid "Set status"
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
-msgstr "状態を設定"
+msgstr "文字�ャット"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
-#: ../src/empathy-preferences.ui.h:4
-#, fuzzy
-#| msgid "Call"
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
-msgstr "発信"
+msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
-#, fuzzy
-#| msgid "Incoming call"
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
-msgstr "�信��り��"
+msgstr "�信"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
-#, fuzzy
-#| msgid "Outgoing voice call"
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
-msgstr "音声�呼����"
+msgstr "発信"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
-#, fuzzy
-#| msgid "Incoming call from %s"
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
-msgstr "%s �ん�ら�呼�出���"
+msgstr "失敗��通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
-#, fuzzy
-#| msgid "Chat"
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
-msgstr "�ャット"
+msgstr "種類"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
-msgstr ""
+msgstr "会話�履歴����を消去��も�����?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
-#, fuzzy
-#| msgid "C_lear"
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
-msgstr "クリア(_L)"
+msgstr "���消去"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+# 日本語�語順�ら��������「アカウント:���る
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
-msgstr ""
+msgstr "アカウント:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr ""
+msgid "_File"
+msgstr "ファイル(_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "�ャット"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "編集(_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
-msgstr ""
+msgstr "����履歴を消去..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
-msgstr ""
+msgstr "相手先�情報"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "映�"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "�ャット"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "編集(_E)"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "ビデオ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-#, fuzzy
-#| msgid "File"
-msgid "_File"
-msgstr "ファイル"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "仲間� ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">読�込�中...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "�ャット(_H)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "相手先�オフライン��"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "�択��相手先�有効�����明��"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "��相手先���種類�会話をサ�ート�����ん"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "��機能����プロトコル��実装�れ����ん"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "��相手先�会話を始�る�������ん���"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "���ャン�ル�ら締�出�れ����"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "���ャン�ル�満員��"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "���ャン�ル��加�る��招待�れる必���り��"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#, fuzzy
+msgid "Can't proceed while disconnected"
+msgstr "相手先�サインアウト��"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "権���り��ん"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "会話を開始�る際�エラー�起�り���"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "相手先� ID �電話番�を入力:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "新��会話"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "映���信(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "ビデオ通話(_V)"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "呼�出�(_A)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "音声通話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
-msgstr "新�呼出"
+msgstr "新��通話"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "アカウント <b>%s</b> ��証�失敗����"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
 "<b>%s</b>"
 msgstr ""
+"次�アカウント�パスワードを入力������\n"
+"<b>%s</b>"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -2664,22 +2555,18 @@ msgstr "独自�メッセージを編集…"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
-msgstr "�気�入り�状態�ら解除�る��クリック���"
+msgstr "クリック�る����状�メッセージを�気�入り�ら削除���"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
-msgstr "��状態を�気�入り��る��クリック���"
+msgstr "クリック�る����状�メッセージを�気�入り����存���"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
-msgstr "状態を設定"
-
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "在席中���在�状態を設定�る"
+msgstr "在席状�を設定"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "独自�メッセージ…"
 
@@ -2697,24 +2584,20 @@ msgid "Find:"
 msgstr "検索:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-#, fuzzy
-#| msgid "Match case"
-msgid "Mat_ch case"
-msgstr "大文字�文字を区別��一致"
+msgid "_Previous"
+msgstr "��(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "フレーズ�見��り��ん���"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "次�(_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "大文字�文字を区別�る(_C)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-#, fuzzy
-#| msgid "_Previous Tab"
-msgid "_Previous"
-msgstr "��タブ�(_P)"
+msgid "Phrase not found"
+msgstr "フレーズ�見��り��ん���"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2726,15 +2609,15 @@ msgstr "インスタント・メッセージを�信��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
-msgstr "�ャット�加��求���"
+msgstr "�ャット��求���"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
-msgstr "仲間�サインイン��"
+msgstr "相手先�サインイン��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
-msgstr "仲間�サインアウト��"
+msgstr "相手先�サインアウト��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
@@ -2746,31 +2629,28 @@ msgstr "サー�ー�接続を断��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
-msgstr "音声�呼���られ�"
+msgstr "音声通話��信��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
-msgstr "音声�呼����"
+msgstr "音声通話�発信��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
-msgstr "音声�会話�終了��"
+msgstr "音声通話�終了��"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "独自�メッセージを編集"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, fuzzy, c-format
-#| msgid "Message received"
 msgid "Message edited at %s"
 msgstr "メッセージを�信��"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
-#, fuzzy
-#| msgid "N_ormal Size"
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
-msgstr "ア�ター���通常サイズ(_O)"
+msgstr "通常サイズ"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
@@ -2789,73 +2669,49 @@ msgid "Blue"
 msgstr "ブルー"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
-#, fuzzy
-#| msgid "The identity provided by the chat server cannot be verified.\n"
 msgid "The identity provided by the chat server cannot be verified."
-msgstr "�ャットサー�ー�ら�供�れるアイデンティティを検証����ん。\n"
+msgstr "�ャットサー�ー�ら�供�れる ID を検証����ん。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
-#, fuzzy
-#| msgid "The certificate is not signed by a Certification Authority"
 msgid "The certificate is not signed by a Certification Authority."
-msgstr "証明書��証局�よ��署��れ����ん"
+msgstr "証明書��証局�よ��署��れ����ん。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:161
-#, fuzzy
-#| msgid "The certificate has expired"
 msgid "The certificate has expired."
-msgstr "証明書�有効期��切れ����"
+msgstr "証明書�有効期��切れ����。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:164
-#, fuzzy
-#| msgid "The certificate hasn't yet been activated"
 msgid "The certificate hasn't yet been activated."
-msgstr "証明書���有効���り��ん"
+msgstr "証明書���有効���り��ん。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:167
-#, fuzzy
-#| msgid "The certificate does not have the expected fingerprint"
 msgid "The certificate does not have the expected fingerprint."
-msgstr "証明書�期待��フィンガープリント���り��ん"
+msgstr "証明書�期待��フィンガープリント���り��ん。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
-#, fuzzy
-#| msgid ""
-#| "The hostname verified by the certificate doesn't match the server name"
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "証明書�検証�れ�ホスト��サー�ー���一致���ん"
+msgstr "証明書�検証�れ�ホスト��サー�ー���一致���ん。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
-#, fuzzy
-#| msgid "The certificate is self-signed"
 msgid "The certificate is self-signed."
-msgstr "証明書�自己署��れ����"
+msgstr "証明書�自己署��れ����。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-#, fuzzy
-#| msgid ""
-#| "The certificate has been revoked by the issuing Certification Authority"
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
-msgstr "証明書�発行者��る�証局�よ���り消�れ����"
+msgstr "証明書�発行者��る�証局�よ��失効�����。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
-#, fuzzy
-#| msgid "The certificate is cryptographically weak"
 msgid "The certificate is cryptographically weak."
-msgstr "証明書�暗�的�弱���"
+msgstr "証明書�暗�的�弱���。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:184
-#, fuzzy
-#| msgid "The certificate length exceeds verifiable limits"
 msgid "The certificate length exceeds verifiable limits."
-msgstr "証明書�検証�能�長�を越�����"
+msgstr "証明書�検証�能�長�を越�����。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:188
-#, fuzzy
-#| msgid "The certificate is malformed"
 msgid "The certificate is malformed."
-msgstr "証明書�異常��り��"
+msgstr "証明書�異常��り��。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
@@ -2872,37 +2728,43 @@ msgid "Continue"
 msgstr "続行"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "��接続�信用����ん。無視��続����?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "���択を将��接続�も記憶�る"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "証明書�詳細"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "URI を開���ん"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "ファイル��択"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
-msgstr ""
+msgstr "ファイルを�存�る��空�容���足�����"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
+"��ファイルを�存�る�� %s �空�容��必�����%s ���り��ん。別�"
+"場所を�ん�����。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s �ん�ら�られ���ファイル"
@@ -3074,41 +2936,32 @@ msgstr "西欧"
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "�択��仲間�ファイルを�信����ん。"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "�択��仲間�オフライン��。"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "エラーメッセージ��"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
-msgstr "インスタント メッセージ (Empathy)"
+msgstr "インスタントメッセージ (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "起動��ら自動的�サインイン���"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "起動時�仲間リストや他�ダイアログを表示���"
+msgstr "起動時�相手先�一覧や他�ダイアログを表示���"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
-msgstr "- Empathy インスタント・メッセンジャー"
+msgstr "- Empathy インスタントメッセンジャー"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr ""
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:645
 #, fuzzy, c-format
-#| msgid "There was an error while parsing the account details."
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
 "The error was:\n"
@@ -3123,7 +2976,7 @@ msgid ""
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
-"Empathy �フリーソフトウェア��;フリーソフトウェア財団��供�る GNU 一般公"
+"Empathy �フリーソフトウェア��; フリーソフトウェア財団�発行�る GNU 一般公"
 "衆利用許諾契約書�第二版��る���れ以��版�定�る�項�下�本プログラム"
 "を�頒布���変更�る�������。"
 
@@ -3134,9 +2987,9 @@ msgid ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
-"Empathy �有用����������頒布������市場性��特定�目的���"
-"��性�����暗黙��証を�������る�証も行����ん。詳細����"
-"� GNU 一般公衆利用許諾契約書を�覧����。"
+"Empathy �役立�も���る��を期待���布�れ������完全�無�証�"
+"�。商用利用���特定�目的���る��性��証��り��ん。詳細� GNU 一般"
+"公衆利用許諾契約書を�覧����。"
 
 #: ../src/empathy-about-dialog.c:89
 msgid ""
@@ -3148,11 +3001,11 @@ msgstr ""
 "る����。�����場���Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA ��手紙を書������。"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
-msgstr "GNOME ���インスタント・メッセンジャー・クライアント��。"
+msgstr "GNOME ��インスタントメッセンジャー・クライアント"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "相花 毅 <takeshi.aihana@gmail.com>\n"
@@ -3161,6 +3014,7 @@ msgstr ""
 "(Contributed to Moblin by Intel GLS)\n"
 "�野 貴之 <AE5T-KSN@asahi-net.or.jp>\n"
 "西堀 清貴 <ml.nishibori.kiyotaka@gmail.com>\n"
+"Mako N <mako@pasero.net>\n"
 "日本GNOMEユーザー会 <http://www.gnome.gr.jp/>"
 
 #: ../src/empathy-account-assistant.c:167
@@ -3193,79 +3047,81 @@ msgstr ""
 "らアカウントを後�追加�る��も����。"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1276
 msgid "An error occurred"
 msgstr "エラー�発生����"
 
-#: ../src/empathy-account-assistant.c:467
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
 msgstr "��種類�アカウント��り���?"
 
-#: ../src/empathy-account-assistant.c:473
+#: ../src/empathy-account-assistant.c:475
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "設定���他�アカウント��り���?"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "アカウント�詳細を入力"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "生����アカウント�種類�?"
 
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "他�アカウントを生�����?"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "新��アカウント�詳細を入力"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
-"Empathy�近��人や��や�僚�Google Talk�AIM�Windows Liveや他�プログラム"
-"�会話�����。マイクやウェブカメラ�も音声や映��会話�����。"
+"Empathy を使���近��人や��や�僚� Google トーク�AIM�Windows Live や"
+"他�プログラム��ャット����。マイクやウェブカメラ�も音声やビデオ�通話"
+"����。"
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
-msgstr "他�会話用プログラム�利用����アカウント��り���?"
+msgstr "他��ャットプログラム�利用����アカウント��り���?"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "���アカウント�詳細をイン�ート��� "
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "���今アカウント�詳細を入力���"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "����新��アカウントを作����"
 
-#: ../src/empathy-account-assistant.c:705
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "����今近��オンライン�人を見������"
 
-#: ../src/empathy-account-assistant.c:726
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "イン�ート���アカウントを�択���:"
 
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "��"
 
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "����今��れ��分��"
 
-#: ../src/empathy-account-assistant.c:1085
+#: ../src/empathy-account-assistant.c:1088
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -3277,18 +3133,16 @@ msgstr ""
 "������。'アカウント' �ダイアログ��後�詳細�簡��変更����。�"
 "����機能を無効��る��も����。"
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1152
 msgid "Edit->Accounts"
 msgstr "編集 → アカウント"
 
-#: ../src/empathy-account-assistant.c:1107
-#, fuzzy
-#| msgid "I don't want to enable this feature for now"
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
-msgstr "��機能を今�有効�����り��ん"
+msgstr "��機能を今�有効�����り��ん(_N)"
 
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1148
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -3297,88 +3151,96 @@ msgid ""
 msgstr ""
 "ローカル�ットワーク�接続��人々��ャット�る�������ん。telepathy-"
 "salut �インストール�れ��������。��機能を有効��る���"
-"telepathy-salut パッケージをインストール��アカウントダイアログ�ら「��近"
-"���る人���アカウントを作�������。"
+"telepathy-salut パッケージをインストール��アカウントダイアログ�ら People "
+"Nearby �アカウントを作�������。"
 
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1154
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut �インストール�れ����ん"
 
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1200
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "メッセージング� VoIP �アカウントアシスタント"
 
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1234
 msgid "Welcome to Empathy"
-msgstr "よ���Empathy�"
+msgstr "よ��� Empathy �"
 
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1243
 msgid "Import your existing accounts"
-msgstr "存在�るアカウントをイン�ート���"
+msgstr "既存�アカウントをイン�ート���"
 
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1261
 msgid "Please enter personal details"
 msgstr "個人�詳細�情報を入力������"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:69
 #, c-format
 msgid "There are unsaved modifications to your %s account."
-msgstr "�存�れ���　%s アカウント��変更��り��。"
+msgstr "%s アカウント���存�れ����変更��り��。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
-msgstr "����新��アカウント����存�れ����ん。"
+msgstr "新��アカウント����存�れ����ん。"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
 msgid "Connecting…"
 msgstr "接続中…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:385
 #, c-format
 msgid "Offline — %s"
 msgstr "オフライン — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:397
 #, c-format
 msgid "Disconnected — %s"
 msgstr "切断 - %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:408
 msgid "Offline — No Network Connection"
 msgstr "オフライン - �ットワーク接続��り��ん"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:415
 msgid "Unknown Status"
 msgstr "�明�状態"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:427
 msgid "Offline — Account Disabled"
 msgstr "オフライン - アカウント�無効"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"変更を破棄��新��アカウントを生��よ�������。\n"
-"本当�継続����?"
+#: ../src/empathy-accounts-dialog.c:530
+msgid "Edit Connection Parameters"
+msgstr "接続パラメーターを編集"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:693
+msgid "Failed to retrieve your personal information from the server."
+msgstr "サー�ー�ら個人情報を�得�る��失敗����。"
+
+#: ../src/empathy-accounts-dialog.c:699
+msgid "Go online to edit your personal information."
+msgstr "個人情報を編集�る���オンライン�������。"
+
+#: ../src/empathy-accounts-dialog.c:784
+msgid "_Edit Connection Parameters..."
+msgstr "接続パラメーター�編集(_E)..."
+
+#: ../src/empathy-accounts-dialog.c:1289
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "コンピューター�ら %s を削除����?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1293
 msgid "This will not remove your account on the server."
 msgstr "�れ�よ���サー�ー�らアカウント�削除�れる����り��ん。"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1529
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3387,19 +3249,15 @@ msgstr ""
 "本当�継続����?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
-#, fuzzy
-#| msgid "_Enabled"
+#: ../src/empathy-accounts-dialog.c:1705
 msgid "_Enable"
-msgstr "サインイン(_E)"
+msgstr "有効化(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
-#, fuzzy
-#| msgid "_Enabled"
+#: ../src/empathy-accounts-dialog.c:1706
 msgid "_Disable"
-msgstr "サインイン(_E)"
+msgstr "無効化(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2176
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3408,24 +3266,18 @@ msgstr ""
 "本当�継続����?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-#, fuzzy
-#| msgid "_Add…"
 msgid "Add…"
-msgstr "追加(_A)…"
-
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "アカウント�情報を読�込�中"
+msgstr "追加…"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "プロトコル�インストール�れ����ん"
+msgid "_Import…"
+msgstr "イン�ート(_I)…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "プロトコル:"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3433,160 +3285,144 @@ msgstr ""
 "新��アカウントを登録�る�����最��利用�るプロトコル��ックエンドを"
 "インストール���������。"
 
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "プロトコル�インストール�れ����ん"
+
 #: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "イン�ート(_I)…"
+msgid "Loading account information"
+msgstr "アカウント�情報を読�込�中"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Empathy �証クライアント"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy �証クライアント"
 
 #: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
-msgstr "��近���る人�"
+msgstr "People nearby"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
 msgid "- Empathy Audio/Video Client"
-msgstr "- Empathy 音声/映�クライアント"
+msgstr "- Empathy 音声/ビデオ・クライアント"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
 msgid "Empathy Audio/Video Client"
-msgstr "Empathy 音声/映�クライアント"
+msgstr "Empathy 音声/ビデオ・クライアント"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "コントラスト"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "明る�"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "ガンマ"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "音�"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "サイド�ー(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
-msgstr "音声"
+msgstr "音声入力"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
-msgstr "映�"
+msgstr "ビデオ入力"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "ダイアルパッド"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "詳細"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1782
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
 #, c-format
 msgid "Call with %s"
-msgstr "%s�発信"
+msgstr "%s ��通話"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address as seen by the machine"
 msgstr "��マシン�見���IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address as seen by a server on the Internet"
 msgstr "インター�ット上�サー�ー�見���IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
 msgid "The IP address of the peer as seen by the other side"
 msgstr "も�一方����見���ピア�IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
 msgid "The IP address of a relay server"
 msgstr "リレーサー�ー�IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
 msgid "The IP address of the multicast group"
 msgstr "マル�キャストグループ�IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1843
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "�明"
-
-#: ../src/empathy-streamed-media-window.c:1846
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "�明"
-
-#: ../src/empathy-streamed-media-window.c:1849
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "�明"
-
-#: ../src/empathy-streamed-media-window.c:1852
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+msgctxt "codec"
 msgid "Unknown"
 msgstr "�明"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "接続���� — %d分%02d秒"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
 msgid "Technical Details"
 msgstr "技術的�詳細"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
-"%s �ソフトウェア�����コンピューター�サ�ート�れ��る��音声形�も�"
-"解����ん"
+"%s �ソフトウェア���使��コンピューター�サ�ート�れ��る��音声フォー"
+"マットも�解����ん"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr ""
-"%s �ソフトウェア�����コンピューター�サ�ート�れ��る��映�形�も�"
-"解����ん"
+"%s �ソフトウェア���使��コンピューター�サ�ート�れ��る��動画フォー"
+"マットも�解����ん"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3595,29 +3431,29 @@ msgstr ""
 "%s ��接続を確立����ん���。�ットワーク上���ら��直接接続を許��"
 "れ������も�れ��ん。"
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
 msgid "There was a failure on the network"
 msgstr "�ットワーク��題�発生����"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
-"��呼�出��必��音声形������コンピューター�インストール�れ���"
-"�ん"
+"��通話�必��音声フォーマット���使��コンピューター�インストール�れ"
+"����ん"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
-"��呼�出��必��映�形������コンピューター�インストール�れ���"
-"�ん"
+"��通話�必��動画フォーマット���使��コンピューター�インストール�れ"
+"����ん"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3628,275 +3464,302 @@ msgstr ""
 "��具�を報告</a>������。��時��ヘルプメニュー�　'デ�ッグ' ウィン"
 "ドウ�集��ログを添付������。"
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
 msgid "There was a failure in the call engine"
-msgstr "呼�出�エンジン��題�発生����"
+msgstr "通話エンジン��題�発生����"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
 msgid "The end of the stream was reached"
 msgstr "ストリーム�終端�到�����"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
 msgid "Can't establish audio stream"
 msgstr "音声ストリームを確立����ん"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
 msgid "Can't establish video stream"
 msgstr "映�ストリームを確立����ん"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "音声"
+msgid "_Call"
+msgstr "通話(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "デコード用コーデック:"
+msgid "_Microphone"
+msgstr "マイク(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-#, fuzzy
-#| msgid "_Enabled"
-msgid "Disable camera"
-msgstr "サインイン(_E)"
+msgid "_Camera"
+msgstr "カメラ(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr ""
+msgid "_Settings"
+msgstr "設定(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "エンコード�るコーデック:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "表示(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "接続を切る"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "ヘルプ(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "�在�通話を止�る"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "目次(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "ローカル�候補:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "デ�ッグ(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr ""
+msgid "Swap camera"
+msgstr "カメラ�入れ替�"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "リモート�候補:"
+msgid "Maximise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "音声��信"
+msgid "Disable camera"
+msgstr "カメラを無効化�る"
 
 #: ../src/empathy-call-window.ui.h:14
-#, fuzzy
-#| msgid "Send _Video"
-msgid "Send Video"
-msgstr "映���信(_V)"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "接続を切る"
 
 #: ../src/empathy-call-window.ui.h:15
-#, fuzzy
-#| msgid "Dialpad"
-msgid "Show dialpad"
-msgstr "ダイアルパッド"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "�在�通話を止�る"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Start a video call"
-msgstr ""
+msgid "Video call"
+msgstr "ビデオ通話"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Start an audio call"
-msgstr ""
-
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr ""
+msgid "Start a video call"
+msgstr "ビデオ通話�開始"
 
 #: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "音声�転�をオン・オフ"
+msgid "Start an audio call"
+msgstr "音声通話�開始"
 
 #: ../src/empathy-call-window.ui.h:20
-#, fuzzy
-#| msgid "Toggle audio transmission"
-msgid "Toggle video transmission"
-msgstr "音声�転�をオン・オフ"
+msgid "Show dialpad"
+msgstr "ダイアルパッドを表示"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
-msgid "Unknown"
-msgstr "�明"
+msgid "Display the dialpad"
+msgstr "ダイヤルパッド�表示"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "映���信"
 
 #: ../src/empathy-call-window.ui.h:23
-#, fuzzy
-#| msgctxt "menu item"
-#| msgid "_Video Call"
-msgid "Video call"
-msgstr "映��会話(_V)"
+msgid "Toggle video transmission"
+msgstr "ビデオ�転�をオン・オフ"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "呼�出�(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "音声��信"
 
 #: ../src/empathy-call-window.ui.h:25
-#, fuzzy
-#| msgid "Camera On"
-msgid "_Camera"
-msgstr "カメラ入"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "目次(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "音声�転�をオン・オフ"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "デ�ッグ(_D)"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "エンコード�るコーデック:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "ヘルプ(_H)"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+msgid "Unknown"
+msgstr "�明"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "デコード用コーデック:"
 
 #: ../src/empathy-call-window.ui.h:30
-#, fuzzy
-#| msgid "Megaphone"
-msgid "_Microphone"
-msgstr "メガホン"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "リモート�候補:"
 
 #: ../src/empathy-call-window.ui.h:31
-#, fuzzy
-#| msgid "<b>Settings</b>"
-msgid "_Settings"
-msgstr "<b>設定</b>"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "ローカル�候補:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "表示(_V)"
+msgid "Audio"
+msgstr "音声"
+
+#: ../src/empathy-chat-window.c:285
+#, fuzzy
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "メインウィンドウを隠�������。"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:301
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+
+#: ../src/empathy-chat-window.c:310
+#, fuzzy, c-format
+#| msgid "Level "
+msgid "Leave %s?"
+msgstr "レベル "
+
+#: ../src/empathy-chat-window.c:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:330
+msgid "Close window"
+msgstr ""
+
+#: ../src/empathy-chat-window.c:330
+#, fuzzy
+#| msgid "Level "
+msgid "Leave room"
+msgstr "レベル "
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (未読 %d)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (他� %u)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (他�ら %d �未読)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (未読�全部� %d)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:888
 msgid "SMS:"
-msgstr ""
+msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:898
 #, fuzzy, c-format
-#| msgid "Typing a message."
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "メッセージを入力�����"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
 msgstr "メッセージを入力�����"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "クリア(_L)"
+msgid "_Conversation"
+msgstr "会話(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "仲間(_O)"
+msgid "C_lear"
+msgstr "消去(_L)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "スマイリー�挿入(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "�気�入り�談話室(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "�加者を招待(_P)…"
+msgid "Notify for All Messages"
+msgstr "����メッセージを通知"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "タブを左�移動(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "相手先�一覧�表示(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "タブを��移動(_R)"
+msgid "Invite _Participant…"
+msgstr "�加者を招待(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "����メッセージを通知"
+msgid "C_ontact"
+msgstr "相手先(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "会話(_C)"
+msgid "_Tabs"
+msgstr "タブ(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "タブ��り外�(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "�気�入り��ャットルーム(_F)"
+msgid "_Previous Tab"
+msgstr "��タブ�(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "次�タブ�(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "��タブ�(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "閉��タブを戻�(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "仲間リスト�表示(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "タブを左�移動(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "タブ(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "タブを��移動(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "閉��タブを戻�(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "タブ��り外�(_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3904,109 +3767,106 @@ msgstr "��"
 
 #: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
-msgstr "部屋"
+msgstr "談話室"
 
 #: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "自動サインイン"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
-msgstr "�気�入り�部屋"
+msgstr "�気�入り�談話室"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
-msgstr "映��呼���られ�"
+msgstr "ビデオ通話��信"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "�信��り��"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
-msgstr "%s �ん�ら�映���信����応答����?"
+msgstr "%s �ん�らビデオ通話��信��。応答����?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
-msgstr "%s �ん�ら��信����応答����?"
+msgstr "%s �ん�ら�信��。応答����?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s �ん�ら�呼�出���"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "拒��る(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "応答�る(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
-msgstr ""
+msgstr "ビデオ�応答(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming video call from %s"
-msgstr "%s �ん�ら�映���呼�出���"
+msgstr "%s �ん�ら�ビデオ通話��信��"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
-msgstr "�ャットルーム��招待"
+msgstr "談話室��招待"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s ���加�招待"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s �ん����を %s �招待�����"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "�断り�る(_D)"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
-msgstr "�加�る(_J)"
+msgstr "�加(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s �ん����を %s �招待����"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "���� %s ���加�招待を���り���"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s �ん�らファイル転���知ら���"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
-#, fuzzy
-#| msgid "Password"
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372
 msgid "Password required"
-msgstr "パスワード"
+msgstr "パスワード�必���"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1217
 #, fuzzy, c-format
-#| msgid "%s would like to send you a file"
 msgid "%s would like permission to see when you are online"
 msgstr "%s �ん�����ファイルを�信���よ���"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -4016,105 +3876,105 @@ msgstr ""
 "メッセージ: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�明"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s � %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" を %s �ん�ら�信中"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" �ら %s ��信中"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "\"%s\" を %s �ら�信エラー"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "ファイル�信エラー"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" � %s ���信エラー"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "ファイル転�エラー"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" を %s �ん�ら�信����"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" を %s �ん��信���"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "ファイル�転��完了����"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "他��加者�応答を待�����"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" �完全性を�ェック�����"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "�ッシュ計算中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "ファイル"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "残り"
 
@@ -4124,194 +3984,209 @@ msgstr "ファイル転�"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "Remove completed, canceled and failed file transfers from the list"
+msgstr "終了・�止・失敗��ファイル転�を一覧�ら削除���"
 
 #: ../src/empathy-import-dialog.c:84
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"�り込����アカウント�見��り��ん���。������在�り込�をサ"
-"�ート���る�� Pidgin �アカウント����。"
+"イン�ート�能�アカウント�見��り��ん���。�在�����イン�ートを"
+"サ�ート���る�� Pidgin �アカウント����。"
 
 #: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
-msgstr "アカウント��り込�"
+msgstr "アカウント�イン�ート"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
-msgstr "�り込む"
+msgstr "イン�ート�る"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "�供元"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:389
 #, fuzzy
-#| msgid "Password"
 msgid "Provide Password"
 msgstr "パスワード"
 
-#: ../src/empathy-main-window.c:398
-#, fuzzy
-#| msgid "Disconnected"
+#: ../src/empathy-roster-window.c:395
 msgid "Disconnect"
-msgstr "�通"
+msgstr "切断"
+
+#: ../src/empathy-roster-window.c:644
+msgid "You need to setup an account to see contacts here."
+msgstr ""
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:660
 msgid "No match found"
 msgstr "見��り��ん���"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:765
+#, fuzzy, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "%s �アカウント��%s �ソフトウェアを更新�る��使���ん。"
+
+#: ../src/empathy-roster-window.c:831
+msgid "Update software..."
+msgstr "ソフトウェア�更新..."
+
+#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
+msgid "Close"
+msgstr "閉�る"
+
+#: ../src/empathy-roster-window.c:942
 msgid "Reconnect"
 msgstr "�接続"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:948
 msgid "Edit Account"
 msgstr "アカウント�編集"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "閉�る"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1092
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1138
 #, fuzzy
-#| msgid "Salut account is created"
 msgid "Top up account credit"
 msgstr "Salut �アカウントを生��る����"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1210
 msgid "Top Up..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1933
 msgid "Contact"
-msgstr "仲間"
-
-#: ../src/empathy-main-window.c:2121
-msgid "Contact List"
-msgstr "仲間リスト"
+msgstr "相手先"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "地図上�仲間(_M)"
+#: ../src/empathy-roster-window.c:2131
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2139
+#, c-format
+msgid "You need to enable %s to see contacts here."
 msgstr ""
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window.c:2419
+msgid "Contact List"
+msgstr "相手先�一覧"
+
+#: ../src/empathy-roster-window.ui.h:1
 #, fuzzy
-#| msgid "Contact List"
-msgid "Find in Contact _List"
-msgstr "仲間リスト"
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "アカウント(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "�気�入り�追加(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "新��会話(_N)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "�気�入り�管�"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "新��通話(_C)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "ア�ター���通常サイズ(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "相手先を検索(_S)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "新��呼�出�(_C)…"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "ファイル転�(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "ア�ター�り�通常サイズ(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "オフライン�相手先を表示(_O)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "プロトコルを表示(_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "クレジット残高"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "地図上�相手先(_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "アカウント(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "ブロック中�相手先(_B)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "設定(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "プロトコル�表示(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "相手先�一覧�検索(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "��順�並�替�(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "状態�並�替�(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "アカウント(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "ア�ター�り�通常サイズ(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-#, fuzzy
-#| msgid "Linked Contacts"
-msgid "_Blocked Contacts"
-msgstr "リンク中�仲間"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "ア�ター���通常サイズ(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "コンパクトサイズ(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "ファイル転�(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "談話室(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "�加(_J)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "新��会話(_N)…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "オフライン�仲間を表示(_O)"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "個人情報(_P)"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "部屋(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "�気�入り�追加(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-#, fuzzy
-#| msgctxt "Link individual (contextual menu)"
-#| msgid "_Link Contacts…"
-msgid "_Search for Contacts…"
-msgstr "仲間をリンク(_L)…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "�気�入り�管�"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
-msgstr "�ャットルーム"
+msgstr "談話室"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "メン�ー"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4324,347 +4199,349 @@ msgstr ""
 "パスワード�必�: %s\n"
 "メン�ー数: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "���"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
-msgstr "部屋リスト�作�を開始����ん"
+msgstr "談話室�一覧作�を開始����ん"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
-msgstr "部屋リスト�作�を�止����ん"
+msgstr "談話室�一覧作�を�止����ん"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "部屋リストをロード����ん"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "談話室��加�る"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
-"入室�る部屋���を入力�る��下��る一覧�ら1�以上�部屋をクリック���"
-"���"
+"�加�る談話室���を入力�る��下��る一覧�ら1�以上�談話室をクリック�"
+"�����"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "談話室(_R):"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
-"��部屋を�供���るサー�ーを入力�る�������部屋��在利用���る"
-"サー�ー��る場��空����������"
+"��談話室を�供���るサー�ーを入力�る�������談話室��在利用��"
+"�るサー�ー��る場��空����������"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "部屋��加�る"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "談話室�一覧をロード����ん"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
-msgstr "部屋�一覧"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "部屋(_R):"
+msgstr "談話室�一覧"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "メッセージを�信��"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "メッセージを�信��"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "新��会話を始��"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "仲間�サインイン��"
+#: ../src/empathy-preferences.c:169
+#, fuzzy
+#| msgid "Contact goes online"
+msgid "Contact comes online"
+msgstr "相手先�サインイン��"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
-msgstr "仲間�サインアウト��"
+msgstr "相手先�サインアウト��"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "自分�サインイン��"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "自分�サインアウト��"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "言語"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
-#, fuzzy
-#| msgid "Client:"
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
-msgstr "クライアント:"
+msgstr "ジュリエット"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
-#, fuzzy
-#| msgid "Room"
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
-msgstr "部屋"
+msgstr "ロミオ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "���ロミオ�ロミオ ! �������ロミオ�ゃ !"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "���をも嫌��自身��をも棄�や。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "�れ��や�ら�����も����人�ゃ�誓言�や。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "��ゃも�キャピュレットをやも����。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
-msgstr ""
+msgstr "も�������? ��物を言���?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
-#, fuzzy
-#| msgid "%s has disconnected"
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
-msgstr "%s �切断�れ���"
+msgstr "ジュリエット�切断����"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "設定"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "スマイリーをアイコン�表示�る(_S)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "談話室�相手先�一覧を表示�る(_L)"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "外観"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "挙動"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "テーマ(_E):"
+msgid "new ta_bs"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "離席中����ら通知を無効��る(_A)"
+msgid "new _windows"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "離席中����らサウンド�演�を無効��る(_A)"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "�信��イベントを通知領域�表示�る"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "起動��ら自動的�接続(_A)"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
+msgid "Log conversations"
+msgstr "会話を記録"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "仲間�在席中����ら通知を有効��る"
+msgid "Behavior"
+msgstr "挙動"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "仲間�オフライン����ら通知を有効��る"
+msgid "General"
+msgstr "全般"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "�ャット・ウィンドウ�フォーカス�無��も通知�る(_C)"
+msgid "_Enable bubble notifications"
+msgstr "�ップアップ通知を有効��る(_E)"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "スペル�ェックを有効��る:"
+msgid "Disable notifications when _away or busy"
+msgstr "離席中����り込�中���通知を無効��る(_A)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "全般"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "�ャットウィンドウ�フォーカス����も通知�る(_C)"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr ""
+msgid "Enable notifications when a contact comes online"
+msgstr "相手先�在席中����ら通知を有効��る"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr ""
+msgid "Enable notifications when a contact goes offline"
+msgstr "相手先�オフライン����ら通知を有効��る"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "通知"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "場所�ソース:"
+msgid "_Enable sound notifications"
+msgstr "サウンド通知を有効��る(_E)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "会話を記録"
+msgid "Disable sounds when _away or busy"
+msgstr "離席中����り込�中���サウンドを鳴ら���(_A)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "通知"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "イベント�サウンドを鳴ら�"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "サウンド"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "プライ�シー"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "通話�質を�上��る��エコー除去を使�(_E)"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"�置精度を下�る����市町�や国�公表�より正確�����り��。GPS座標�"
-"�数点第1���正確��。"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "スマイリーをアイコン�表示�る(_S)"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "部屋�仲間リストを表示�る(_L)"
+"エコー除去������声をよりクリア�相手�届���。����コンピューター"
+"�よ����題�生���。奇妙�雑音�����り通話中�音飛���る場���"
+"エコー除去をオフ����通話を����始������。"
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "サウンド"
+msgid "_Publish location to my contacts"
+msgstr "相手先�場所を公開�る(_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "スペル��ェック"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "言語�一覧�インストール���る辞書�言語��を�映���。"
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"�置精度を下�る����国�州(県)�市より精確�場所を公開���ん。GPS 座標"
+"��数点第1����精度��。"
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "テーマ"
+msgid "_Reduce location accuracy"
+msgstr "場所�精度を下�る(_R)"
 
 #: ../src/empathy-preferences.ui.h:30
-#, fuzzy
-#| msgid "Bearing:"
-msgid "Variant:"
-msgstr "方�:"
+msgid "Privacy"
+msgstr "プライ�シー"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "起動��ら自動的�接続(_A)"
+msgid "_GPS"
+msgstr "GPS(_G)"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "�帯(_C)"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "�ップアップ通知を有効��る(_E)"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "�ットワーク (IP�Wi-Fi)(_N)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "サウンド演��よる通知を有効��る(_E)"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "GPS(_G)"
+msgid "Location sources:"
+msgstr "場所�ソース:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "�ットワーク(IP�Wi-Fi)(_N)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "言語�一覧�インストール���る辞書�言語��を�映���。"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "新��会話�度�別�ウィンドウを開�(_O)"
+msgid "Enable spell checking for languages:"
+msgstr "スペル�ェックを有効��る:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "自分�仲間��置を公表�る(_P)"
+msgid "Spell Checking"
+msgstr "スペル�ェック"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "テーマ(_E):"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "�置精度を下�る(_R)"
+#, fuzzy
+msgid "Variant:"
+msgstr "方�:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "テーマ"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "状態"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "仲間を�度呼�出�"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "カメラ切"
+msgid "Redial"
+msgstr "リダイアル"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "カメラ入"
+msgid "V_ideo"
+msgstr "ビデオ(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "ビデオ切"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "カメラを無効���映���信を中止"
+msgid "Video Preview"
+msgstr "ビデオ�プレビュー"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "カメラを有効���映�を�る"
+msgid "Video On"
+msgstr "ビデオ入"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "カメラを有効��る�映�を�ら��"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "相手先を�度呼�出�"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "プレビュー"
+msgid "Camera Off"
+msgstr "カメラ切"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "リダイアル"
+msgid "Disable camera and stop sending video"
+msgstr "カメラを無効���映���信を中止"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "映�(_I)"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "プレビュー"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "映�切"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "カメラを有効��る�映�を�ら��"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "映�入"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "カメラ入"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "映��プレビュー"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "カメラを有効���映�を�信"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Contact Map View"
 
@@ -4674,7 +4551,7 @@ msgstr "�存"
 
 #: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
-msgstr "デ�ッグ・ウィンドウ"
+msgstr "デ�ッグウィンドウ"
 
 #: ../src/empathy-debug-window.c:1517
 msgid "Pause"
@@ -4730,16 +4607,16 @@ msgid ""
 "extension."
 msgstr "�択��接続マ�ージャー�リモートデ�ッグ拡張をサ�ート�����ん。"
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "�加者を招待"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
-msgstr "会話�招待�る仲間を�ん�����"
+msgstr "会話�招待�る相手先を�ん�����"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "招待�る"
 
@@ -4748,11 +4625,9 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ダイアログを何も表示���処�(イン�ート��)を進��終了�る"
 
 #: ../src/empathy-accounts.c:187
-#, fuzzy
-#| msgid "Don't display any dialogs if there are any non-Salut accounts"
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "Salut アカウント���れ��ダイアログを何も表示���"
+msgstr "\"People Nearby\" アカウント���れ��ダイアログを何も表示���"
 
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
@@ -4764,109 +4639,266 @@ msgstr ""
 msgid "<account-id>"
 msgstr "<アカウント ID>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:196
+#, fuzzy
+msgid "Show account assistant"
+msgstr "アカウント・ダイアログを表示�る"
+
+#: ../src/empathy-accounts.c:202
 msgid "- Empathy Accounts"
 msgstr "- Empathy �アカウント"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:238
 msgid "Empathy Accounts"
 msgstr "Empathy �アカウント"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr ""
 
-#: ../src/empathy-debugger.c:75
-#, fuzzy
-#| msgid "Empathy Debugger"
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
-msgstr "Empathy デ�ッガー"
+msgstr "- Empathy デ�ッガー"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy デ�ッガー"
 
 #: ../src/empathy-chat.c:107
-#, fuzzy
-#| msgid "- Empathy IM Client"
 msgid "- Empathy Chat Client"
-msgstr "- Empathy インスタント・メッセンジャー"
+msgstr "- Empathy �ャットクライアント"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "応答�る"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1565
 msgid "Reject"
 msgstr "拒�"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1566
 msgid "Answer"
 msgstr "応答"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
 msgid "Answer with video"
-msgstr ""
+msgstr "ビデオ�応答"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr "�断り"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
 msgid "Accept"
 msgstr "���る"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:247
 #, fuzzy
-#| msgid "Preview"
 msgid "Provide"
 msgstr "プレビュー"
 
 #: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
-msgstr ""
+msgstr "%s �呼�出�������������別�通話中���。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
 msgid "i"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2727
+#: ../src/empathy-call-window.c:2929
 msgid "On hold"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2932
 msgid "Mute"
-msgstr ""
+msgstr "ミュート"
 
-#: ../src/empathy-call-window.c:2732
-#, fuzzy
-#| msgid "Location"
+#: ../src/empathy-call-window.c:2934
 msgid "Duration"
-msgstr "場所"
+msgstr "通話時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
-#, fuzzy, c-format
-#| msgid "Connected — %d:%02dm"
+#: ../src/empathy-call-window.c:2937
+#, c-format
 msgid "%s — %d:%02dm"
-msgstr "接続���� — %d分%02d秒"
+msgstr "%s — %d分%02d秒"
+
+#: ../src/empathy-call-window.c:3207
+#, c-format
+msgid "Your current balance is %s."
+msgstr "�在�残高� %s ��。"
+
+#: ../src/empathy-call-window.c:3211
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "残高��足���る���通話����ん。"
+
+#: ../src/empathy-call-window.c:3213
+msgid "Top Up"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-search-bar.c:243
-#, fuzzy
-#| msgid "Match case"
 msgid "_Match case"
-msgstr "大文字�文字を区別��一致"
+msgstr "大文字�文字を区別�る(_M)"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "新��アカウント�追加"
+
+#~ msgid "Personal Information"
+#~ msgstr "個人�情報"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "リンク中�相手先"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "リンク�る連絡先��択"
+
+#~ msgid "New contact preview"
+#~ msgstr "新��相手先をプレビュー"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "左�一覧��択��相手先�互��リンク�����"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "相手先をリンク(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "相手先をリンク"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "リンクを外�(_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "表示���るメタ相手先を�個別�相手先�完全�分離���。"
+
+#~ msgid "_Link"
+#~ msgstr "リンク(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "メタ相手先 '%s' �リンクを外����?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "��メタ相手先�リンクを外����? メタ相手先を�個別�相手先�完全�分離"
+#~ "���。"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "リンクを外�(_U)"
+
+#~ msgid "_Personal Information"
+#~ msgstr "個人情報(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "新���ャット���別�ウィンドウを開�(_O)"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy � butterfly �ログを移行����"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Empathy � butterfly �ログを移行������。"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "サ�ート�れ����ソケットタイプ��"
+
+#, fuzzy
+#~| msgid "Empathy Accounts"
+#~ msgid "My Web Accounts"
+#~ msgstr "Empathy �アカウント"
+
+#, fuzzy
+#~| msgid "Empathy Accounts"
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Empathy �アカウント"
+
+#, fuzzy
+#~| msgid "_Edit"
+#~ msgid "Edit %s"
+#~ msgstr "編集(_E)"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "中止(_N)"
+
+#~ msgid "Ungrouped"
+#~ msgstr "グループ無所属"
+
+#~ msgid "Favorite People"
+#~ msgstr "�気�入り�人�"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "編集(_E)"
+
+#~ msgid "Select a contact"
+#~ msgstr "連絡先��択"
+
+#~ msgid "Contact ID:"
+#~ msgstr "仲間� ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "�ャット(_H)"
+
+#~ msgid "Send _Video"
+#~ msgstr "映���信(_V)"
+
+#~ msgid "C_all"
+#~ msgstr "呼�出�(_A)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "在席中���在�状態を設定�る"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "�択��仲間�ファイルを�信����ん。"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "�択��仲間�オフライン��。"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "変更を破棄��新��アカウントを生��よ�������。\n"
+#~ "本当�継続����?"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "�明"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "�明"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "�明"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "�明"
 
 #~ msgid "All"
 #~ msgstr "���"
@@ -5016,9 +5048,6 @@ msgstr "大文字�文字を区別��一致"
 #~ msgid "Set your own presence"
 #~ msgstr "����在席情報をセット���"
 
-#~ msgid "Show the accounts dialog"
-#~ msgstr "アカウント・ダイアログを表示�る"
-
 #~ msgid "The error message was: <span style=\"italic\">%s</span>"
 #~ msgstr "エラーメッセージ: <span style=\"italic\">%s</span>"
 
diff --git a/po/nb.po b/po/nb.po
index b35b7a09a..b67afac49 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,4 +1,4 @@
-# Norwegian (bokmål) translation of empathy.
+# Norwegian bokmål translation of empathy.
 # Copyright © 2003-2005 Free Software Foundation, Inc.
 # Kjartan Maraas <kmaraas@gnome.org>, 2003-2012.
 # Sigurd Gartmann <sigurdga@yahoo-inc.com>, 2005, 2006.
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-16 17:05+0100\n"
-"PO-Revision-Date: 2012-01-16 17:07+0100\n"
+"POT-Creation-Date: 2012-02-19 15:37+0100\n"
+"PO-Revision-Date: 2012-02-19 15:41+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: no\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.1\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -34,6 +33,16 @@ msgstr "Empathy internettmeldinger"
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr "Prat på Google Talk, Facebook, MSN og mange andre pratetjenester"
 
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "Meldings- og VoIP-kontoer"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "HÃ¥ndter meldings- og VoIP-kontoer"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Connection managers should be used"
 msgstr "Tilkoblingshåndterer skal brukes"
@@ -156,116 +165,124 @@ msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Lagret posisjon (i pikselr) for pratevinduets sideområde."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+msgid "Show contact groups"
+msgstr "Vis kontaktgrupper"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+msgid "Whether to show groups in the contact list."
+msgstr "Om kontaktgrupper skal vises i kontaktlisten."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Contact list sort criterion"
 msgstr "Sorteringskriterier for kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "Hvilke kriterier som skal brukes ved sortering av kontaktlisten. Forvalg er "
-"å sortere kontakter etter verdien «name». Hvis man bruker «state» vil "
-"kontaktlisten sorteres etter kontaktens tilstand."
+"å sortere kontakter etter kontaktens tilstand med verdien «state». Hvis man "
+"bruker «name» vil kontaktlisten sorteres etter kontaktens navn."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Use notification sounds"
 msgstr "Bruk varslingslyder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Whether to play a sound to notify of events."
 msgstr "Om lyder skal spilles av for å varsle om hendelser."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Disable sounds when away"
 msgstr "Slå av lyder når du er borte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Om lyder skal spilles av når du er borte eller opptatt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound for incoming messages"
 msgstr "Spill av lyd når meldinger kommer inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Om lyder skal spilles av for å varsle om innkommende meldinger."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for outgoing messages"
 msgstr "Spill av lyd for utgående meldinger"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Om lyder skal spilles av for å varsle om utgående meldinger."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Spill av lyd ved nye samtaler"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Om lyder skal spilles av for å varsle om nye samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Spill av lyd når kontakter logger inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Om en lyd skal spilles av for å varsle om at kontakter logger inn på "
 "nettverket."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when a contact logs out"
 msgstr "Spill av lyd når kontakter logger ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Om en lyd skal spilles av for å varsle at kontakter logger ut av nettverket."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Play a sound when we log in"
 msgstr "Spill av lyd når du logger inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Whether to play a sound when logging into a network."
 msgstr "Om lyder skal spilles av når du logger inn på et nettverk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Play a sound when we log out"
 msgstr "Spill av lyd når du logger ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Om lyder skal spilles av når du logger ut av et nettverk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Enable popup notifications for new messages"
 msgstr "Aktiver varsling oppsprettmeldinger for nye meldinger"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Om varsling skal vises når en ny melding mottas."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Disable popup notifications when away"
 msgstr "Slå av varsling når du er borte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Om varsling skal vises når du er borte eller opptatt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Vis varsling når prat ikke er fokusert"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -273,105 +290,115 @@ msgstr ""
 "Om varsling skal vises når en melding mottas selv om pratevinduet er åpent "
 "men ikke har fokus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Pop up notifications when a contact logs in"
 msgstr "Vis varsling når en kontakt logger inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Om et varsel skal vises når en kontakt er kobler fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Pop up notifications when a contact logs out"
 msgstr "Vis varsling når en kontakt logger ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Om varsel skal vises når en kontakt kobler fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Use graphical smileys"
 msgstr "Vis smilefjes grafisk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Om smilefjes skal konverteres til grafiske bilder i samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Show contact list in rooms"
 msgstr "Vis kontaktliste i rom"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Om kontaktlisten skal vises i praterom."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Chat window theme"
 msgstr "Tema for samtalevindu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Temaet som brukes til å vise samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Chat window theme variant"
 msgstr "Temavariant for samtalevindu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Temavariant som brukes til å vise samtale i pratevinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Path of the Adium theme to use"
 msgstr "Sti til Adium-tema som skal brukes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Sti til Adium-tema skal brukes hvis tema for prat er Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Enable WebKit Developer Tools"
 msgstr "Slå på utviklerverktøy for WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Om utviklerverktøy for WebKit, som Web Inspector, skal slås på."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Inform other users when you are typing to them"
+msgstr "Informer andre brukere når du skriver til dem"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr "Hvorvidt tilstand for «skriver» eller «pause» i prat skal sendes. Påvirker ikke status «borte»."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Use theme for chat rooms"
 msgstr "Bruk tema for samtalerom"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to use the theme for chat rooms."
 msgstr "Om tema skal brukes for praterom eller ikke."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Spell checking languages"
 msgstr "Stavekontrollspråk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Kommaseparert liste over stavekontrollspråk som skal brukes (f.eks \"no, en, "
 "fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Enable spell checker"
 msgstr "Bruk stavekontroll"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Om stavekontroll skal sjekke ord mot de språkene du ønsker å bruke."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Nick completed character"
 msgstr "Tegn for fullføring av kallenavn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -379,54 +406,54 @@ msgstr ""
 "Tegn som skal legges til etter kallenavn når fullføring av kallenavn med "
 "tabulator benyttes i gruppeprat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy skal bruke personbildet for kontakten som ikon for pratevinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Last account selected in Join Room dialog"
 msgstr "Siste konto valgt i dialogen «Bli med i rom»"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr "D-Bus objektsti for siste konto valgt for å bli med i et rom."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Camera device"
 msgstr "Kameraenhet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Forvalgt kameraenhet til bruk for videosamtaler. F.eks. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Camera position"
 msgstr "Kameraposisjon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Position the camera preview should be during a call."
 msgstr "Posisjon for kameraforhåndsvisning under en samtale."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Echo cancellation support"
 msgstr "Støtte for utlikning av ekko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Hvorvidt Pulseaudio's filter for utlikning av ekko skal slås på."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Show hint about closing the main window"
 msgstr "Vis hint om lukking av hovedvinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -434,58 +461,48 @@ msgstr ""
 "Om meldingsdialog om lukking av vinduet med «x»-knappen i tittelfeltet skal "
 "vises."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Empathy can publish the user's location"
 msgstr "Empathy kan publisere brukers plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Om Empathy kan publisere brukers plassering til kontakter."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy kan bruke nettverket til å gjette plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Om Empathy kan bruke nettverket for å gjette plassering."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy kan bruke mobilnettverk til å gjette plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Om Empathy kan bruke mobilnettverk for å gjette plassering."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy kan bruke GPS til å gjette plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Om Empathy kan bruke GPS for å gjette plassering."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy skal redusere nøyaktighet for plasseringenseri"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Om Empathy skal redusere nøyaktighet for plassering av personvernhensyn."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Meldings- og VoIP-kontoer"
-
-#: ../data/empathy-accounts.desktop.in.in.h:2
-msgid "Manage Messaging and VoIP accounts"
-msgstr "HÃ¥ndter meldings- og VoIP-kontoer"
-
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
 msgstr "Ingen årsak oppgitt"
@@ -510,7 +527,7 @@ msgstr "Feil under overføring av filen"
 msgid "The other participant is unable to transfer the file"
 msgstr "Avsender kan ikke overføre filen"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
@@ -546,139 +563,139 @@ msgstr "Samtale med %s"
 msgid "Call from %s"
 msgstr "Samtale fra %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Borte"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Frakoblet"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Status er satt til frakoblet"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
+#: ../libempathy/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 "Nettverksfeil"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Autentiseringen feilet"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Krypteringsfeil"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Navn i bruk"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Sertifikat ikke oppgitt"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikat"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Sertifikat utgått"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Sertifikat ikke aktivert"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Feil vertsnavn i forhold til sertifikat"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Fingeravtrykk stemmer ikke for sertifikat"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Selvsignert sertifikat"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Sertifikatsfeil"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Sertifikatet ikke ugyldig"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Tilkobling nektes"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Tilkobling kan ikke etableres"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Tilkobling mistet"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Denne ressursen er allerede koblet til tjeneren"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Denne kontoen er allerede koblet til tjeneren"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Tilkoblingen er erstattet med en ny tilkobling som bruker samme ressurs"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Tjeneren er for opptatt til å håndtere tilkoblingen"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Sertifikatet er trukket tilbake"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikatet bruker en usikker cipher-algoritme eller er kryptografisk svakt"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -686,69 +703,73 @@ msgstr ""
 "Lengden på tjenersertifikatet eller dybden på sertifikatkjeden på tjeneren "
 "oversteg grensen som settes av kryptografibiblioteket"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Programvaren din er for gammel"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Intern feil"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Personer i nærheten"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-prat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minutt siden"
 msgstr[1] "%d minutter siden"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dager siden"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d uke siden"
 msgstr[1] "%d uker siden"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "i fremtiden"
 
@@ -757,7 +778,7 @@ msgid "All accounts"
 msgstr "Alle kontoer"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
@@ -775,30 +796,30 @@ msgstr "Tjener"
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Bruk"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "L_ogg inn"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Denne kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Lag en ny konto på tjeneren"
 
@@ -807,19 +828,19 @@ msgstr "Lag en ny konto på tjeneren"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s av %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Ny konto"
 
@@ -1298,40 +1319,40 @@ msgstr "Nødsamtaler er ikke støttet på denne protokollen"
 msgid "You don't have enough credit in order to place this call"
 msgstr "Du har ikke nok kreditt til å starte denne samtalen"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Klarte ikke å åpne privat prat"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Emne er ikke støttet for denne samtalen"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Du har ikke lov til å bytte emne"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "«%s» er ikke en gyldig kontakt-ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: tøm alle meldinger fra aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <emne>: sett emne for aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID for praterom>: bli med i et nytt praterom"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <prateroms-ID>: bli med i et nytt praterom"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1339,23 +1360,23 @@ msgstr ""
 "/part [<praterom-ID>] [<Ã¥rsak>]: forlat praterommet, forvalg er det aktive "
 "rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontakt-ID> [<melding>]: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakt-ID> <melding>: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kallenavn>: bytt kallenavn på denne tjeneren"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <melding>: send en HANDLINGS-melding til aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1365,11 +1386,11 @@ msgstr ""
 "sende en melding som starter med tegnet «/». For eksempel: «/say /join "
 "brukes til å bli med i et nytt praterom»"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-ID>: vis informasjon om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1377,120 +1398,126 @@ msgstr ""
 "/help [<kommando>]: vis alle støttede kommandoer. Vis hjelp for <kommando> "
 "hvis den er definert."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Bruk: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Ukjent kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "ikke nok kreditt til å sende melding"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Feil ved sending av melding «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Feil ved sending av melding: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "ikke nok kreditt til å sende melding. <a href='%s'>Fyll på</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "ikke kapabel"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "tilgang nektet"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "meldingen er for lang"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "ikke implementert"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
-msgstr "Emnet er satt til: %s"
+msgstr "Emne satt til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Emne satt av %s til: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Emne ikke definert"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Legg til «%s» i ordboken"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Legg til «%s» i ordbok for %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Sett inn smilefjes"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Klarte ikke å hente siste logger"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har koblet fra"
@@ -1498,12 +1525,12 @@ msgstr "%s har koblet fra"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ble sparket av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ble sparket"
@@ -1511,17 +1538,17 @@ msgstr "%s ble sparket"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ble bannlyst av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s ble bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forlatt rommet"
@@ -1531,17 +1558,17 @@ msgstr "%s har forlatt rommet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har blitt med i rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
@@ -1549,55 +1576,55 @@ msgstr "%s er nå kjent som %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../libempathy-gtk/empathy-chat.c:2993
 #: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Koblet fra"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Vil du lagre dette passordet?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Husk"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Ikke nå"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Feil passord; vennligst prøv igjen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Dette rommet er beskyttet med et passord:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Bli med"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Koblet til"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Samtale"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1665,33 +1692,29 @@ msgstr "_Ã…pne lenke"
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Personlig informasjon"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blokker %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Er du sikker på at du vil blokkere «%s» fra å kontakte deg igjen?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokker"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1864,7 +1887,7 @@ msgstr "Høyde:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Sted"
 
@@ -1890,6 +1913,16 @@ msgstr "Lagre personbilder"
 msgid "Unable to save avatar"
 msgstr "Kan ikke lagre personbilde"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personlige detaljer"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Kontaktdetaljer"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Fullt navn"
@@ -1972,11 +2005,6 @@ msgstr "Alias:"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Plassering</b> (dato)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Contact Details"
-msgstr "Kontaktdetaljer"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
@@ -1998,11 +2026,11 @@ msgstr "Versjon:"
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2010,17 +2038,17 @@ msgstr ""
 "Velg gruppene du ønsker at denne kontakten skal vises i. Du kan velge flere "
 "eller ingen."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Legg til gruppe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Velg"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-roster-window.c:1919
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Gruppe"
 
@@ -2040,156 +2068,140 @@ msgstr[1] "Følgende identiteter kan ikke blokkeres:"
 msgid "Edit Contact Information"
 msgstr "Endre kontaktinformasjon"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Koblede kontakter"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Velg kontakter som skal kobles"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Forhåndsvisning av ny kontakt"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Kontakter som velges i listen til venstre vil bli koblet sammen."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Velg en konto til bruk for samtalen"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Ring"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Hjemme"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Blokker kontakt"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
 #: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Prat"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Lydsamtale"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videosamtale"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
 #: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "_Tidligere samtaler"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Send fil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Del mitt skrivebord"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Favoritt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts er ikke installert"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Vennligst installer gnome-contacts for tilgang til kontaktdetaljer."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Infor_masjon"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_ediger"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "Koble kontakter …"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Inviterer deg til dette rommet"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Inviter til praterom"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
 #: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Legg til kontakt …"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Slett og _blokker"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vil du virkelig fjerne gruppen «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Fjerner gruppe"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2611
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2471
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vil du virkelig fjerne kontakten «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2480
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2198,7 +2210,7 @@ msgstr ""
 "Vil du virkelig fjerne lenket kontakt «%s»? Merk at dette vil fjerne alle "
 "kontaktene den lenkede kontakten består av."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2492
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Fjerner kontakt"
 
@@ -2242,49 +2254,6 @@ msgstr "ny tjener"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Koble kontakter"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Fjern kobling …"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Del opp vist lenket kontakt i kontaktene den inneholder."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Koble"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Fjern kobling for lenkede kontakter «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Er du sikker på at du vil fjerne kobling for disse lenkede kontaktene? Dette "
-"vil dele de lenkede kontaktene opp i enkelte kontakter."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Fjern kobling"
-
 #: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historikk"
@@ -2385,7 +2354,7 @@ msgid "Text chats"
 msgstr "Tekstsamtaler"
 
 #: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Samtaler"
 
@@ -2644,12 +2613,12 @@ msgstr "Samtale avsluttet"
 msgid "Edit Custom Messages"
 msgstr "Rediger egendefinerte meldinger"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Melding redigert %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2727,34 +2696,38 @@ msgid "Certificate hostname: %s"
 msgstr "Vertsnavn i sertifikat: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Fortsett"
+msgid "C_ontinue"
+msgstr "F_ortsett"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Tilkobling uten tillit"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Denne tilkoblingen er ikke tiltrodd. Vil du fortsette likevel?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Husk dette valget for fremtidige tilkoblinger"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Sertifikatdetaljer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Kan ikke åpne URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Ikke nok ledig plass til å lagre filen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2763,7 +2736,7 @@ msgstr ""
 "%s ledig plass kreves for å lagre denne filen, men kun %s er tilgjengelig. "
 "Vennligst velg en annen lokasjon."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Innkommende fil fra %s"
@@ -3017,231 +2990,73 @@ msgstr ""
 "Espen Stefansen\n"
 "Torstein Adolf Winterseth <kvikende@fsfe.org>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Det oppsto en feil under import av kontoene."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Det oppsto en feil under innlesing av detaljer for kontoen."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Det oppsto en feil under oppretting av kontoen."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Det oppsto en feil."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Feilmeldingen var: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Du kan enten gå tilbake og prøve å oppgi detaljer for kontoen igjen eller "
-"avslutte assistenten og legge til kontoer senere fra Rediger-menyen."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "En feil oppsto"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Hvilken type konto har du?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Har du noen andre lynmeldingskontoer du vil sette opp?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Oppgi detaljer for konto"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Hvilken type lynmeldingskonto vil du lage?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Vil du lage flere lynmeldingskontoer?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Oppgi detaljer for den nye kontoen"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Empathy lar deg prate med folk på nettverk i nærheten og med venner og "
-"kolleger som bruker Google Talk, AIM, Windows Live og mange andre "
-"prateprogrammer. Hvis du har en mikrofon eller et nettkamera kan du også ha "
-"lyd- og bildesamtaler."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Har du en konto som du har brukt med et annet lynmeldingsprogram?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Ja, importer mine kontodetaljer fra "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Ja, jeg vil skrive inn mine kontodetaljer nå"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "Nei, jeg vil ha en ny konto"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "Nei, jeg vil bare se personer i nærheten foreløpig"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Velg kontoer du vil importere:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "Ja"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "Nei, det var alt for nå"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy kan oppdage og prate med andre som er koblet på samme nettverk som "
-"deg automatisk. Hvis du vil bruke denne funksjonen må du sjekke om detaljene "
-"under er riktige. Du kan lett endre disse detaljene senere eller slå av "
-"funksjonen i «Konto»-dialogen"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Rediger->Kontoer"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "Jeg vil ikke slå på de_nne funksjonen nå"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Du vil ikke kunne prate med personer som er koblet på ditt lokale nettverk "
-"siden telepathy-salut ikke er installert. Hvis du vil slå på denne "
-"funksjonen må du installere pakken telepathy-salut og opprette en «Folk i "
-"nærheten»-konto i Konto-dialogen"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut er ikke installert"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Assistent for meldings- og VoIP-kontoer"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Velkommen til Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Importer dine eksisterende kontoer"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Vennligst oppgi personlige detaljer"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:71
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Det finnes ikke-lagrede endringer for din %s-konto."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:75
 msgid "Your new account has not been saved yet."
 msgstr "Din nye konto er ikke lagret ennå."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:347
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Kobler til …"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "Frakoblet - %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Koblet fra - %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "Frakoblet - Ingen nettverkstilkobling"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "Ukjent status"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
 msgstr "Frakoblet - Konto deaktivert"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:533
 msgid "Edit Connection Parameters"
 msgstr "Rediger parametere for tilkobling"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:696
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Klarte ikke å hente din personlige informasjon fra tjeneren."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:702
 msgid "Go online to edit your personal information."
 msgstr "Rediger din personlige informasjon på nettet."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:787
 msgid "_Edit Connection Parameters..."
 msgstr "R_ediger parametere for tilkoblingen …"
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1283
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vil du fjerne %s fra din datamaskin?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1287
 msgid "This will not remove your account on the server."
 msgstr "Dette vil ikke fjerne din konto på tjeneren."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3250,15 +3065,23 @@ msgstr ""
 "dine endringer. Er du sikker på at du vil fortsette?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "Slå _på"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "Slå _av"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Hopp over"
+
+#: ../src/empathy-accounts-dialog.c:2087
+msgid "_Connect"
+msgstr "_Koble til"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3275,8 +3098,8 @@ msgid "_Import…"
 msgstr "_Importer …"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokoll:"
+msgid "Loading account information"
+msgstr "Laster kontoinformasjon"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
@@ -3287,12 +3110,8 @@ msgstr ""
 "til en ny konto."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol installed"
-msgstr "Ingen protokoll installert"
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Loading account information"
-msgstr "Laster kontoinformasjon"
+msgid "No protocol backends installed"
+msgstr "Ingen protokollmotor installert"
 
 #: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
@@ -3302,15 +3121,11 @@ msgstr "- Empathy autentiseringsklient"
 msgid "Empathy authentication client"
 msgstr "Empathy autentiseringsklient"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Personer i nærheten"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy lyd-/bildeklient"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy lyd-/bildeklient"
 
@@ -3353,33 +3168,33 @@ msgstr "Detaljer"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Samtale med %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "IP-adresse som sett av maskinen"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adresse som sett av en tjener på internett"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adresse for peer som sett av andre siden"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "IP-adresse for en relay-tjener"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "IP-adresse for multicast-gruppe"
 
@@ -3398,12 +3213,12 @@ msgid "Connected — %d:%02dm"
 msgstr "Koblet til - %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Tekniske detaljer"
 
 #: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3413,7 +3228,7 @@ msgstr ""
 "datamaskin"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3423,7 +3238,7 @@ msgstr ""
 "datamaskin"
 
 #: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3433,12 +3248,12 @@ msgstr ""
 "ikke tillater direkte tilkoblinger."
 
 #: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "Det oppsto en feil på nettverket"
 
 #: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-call-window.c:3100
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3446,7 +3261,7 @@ msgstr ""
 "datamaskin"
 
 #: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-call-window.c:3103
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3454,7 +3269,7 @@ msgstr ""
 "datamaskin"
 
 #: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3466,22 +3281,22 @@ msgstr ""
 "«Feilsøking»-vinduet i Hjelp-menyen."
 
 #: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "Det oppsto en feil i samtalemotoren"
 
 #: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "Slutt på strømmen ble nådd"
 
 #: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "Kan ikke etablere lydstrøm"
 
 #: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "Kan ikke etablere videostrøm"
 
@@ -3503,23 +3318,23 @@ msgid "_Settings"
 msgstr "Inn_stillinger"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-roster-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:17
 #: ../src/empathy-streamed-media-window.ui.h:8
 msgid "_View"
 msgstr "_Vis"
 
 #: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Help"
 msgstr "_Hjelp"
 
 #: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Contents"
 msgstr "_Innhold"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Debug"
 msgstr "_Feilsøk"
 
@@ -3594,8 +3409,8 @@ msgstr "Kodek for koding:"
 
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -3614,51 +3429,100 @@ msgstr "Ekstern kandidat:"
 msgid "Local Candidate:"
 msgstr "Lokal kandidat:"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "Audio"
 msgstr "Lyd"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Lukk dette vinduet?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Hvis du lukker dette vinduet vil du forlate %s. Du vil ikke motta videre "
+"meldinger før du blir med igjen."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Hvis du lukker dette vinduet vil du forlate praterommet. Du vil ikke motta "
+"videre meldinger før du blir med igjen."
+msgstr[1] ""
+"Hvis du lukker dette vinduet vil du forlate %u praterom. Du vil ikke motta "
+"videre meldinger før du blir med igjen."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Forlat %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Du vil ikke motta videre meldinger fra dette praterommet før du blir med "
+"igjen."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Lukk vindu"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Forlat rom"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ulest)"
 msgstr[1] "%s (%d uleste)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (og %u annen)"
 msgstr[1] "%s (og %u andre)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ulest fra andre)"
 msgstr[1] "%s (%d uleste fra andre)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d ulest fra alle)"
 msgstr[1] "%s (%d uleste fra alle)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sender %d melding"
 msgstr[1] "Sender %d meldinger"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Skriver en melding"
 
@@ -3742,7 +3606,7 @@ msgstr "HÃ¥ndter favorittrom"
 msgid "Incoming video call"
 msgstr "Innkommende videosamtale"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
@@ -3757,7 +3621,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ringer deg. Vil du svare?"
 
 #: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Innkommende samtale fra %s"
@@ -3775,7 +3639,7 @@ msgid "_Answer with video"
 msgstr "Sv_ar med video"
 
 #: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Innkommende videosamtale fra %s"
@@ -3818,7 +3682,7 @@ msgstr "Du har blitt invitert til å bli med i %s"
 msgid "Incoming file transfer from %s"
 msgstr "Innkommende filoverføring fra %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Passord kreves"
 
@@ -3947,86 +3811,108 @@ msgstr "Filoverføringer"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Fjerning fullført. Filoverføringer fra listen er avbrutt og feilet"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importer"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "Fant ingen kontoer å importere. Empathy støtter kun import fra Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importer kontoer"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importer"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Oppgi passord"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Du må sette opp en konto for å se kontakter her."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ingen treff funnet"
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "Beklager %s-kontoer kan ikke brukes før %s-programvaren er oppdatert."
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Oppdater programvare …"
 
-#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Lukk"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Koble til på nytt"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Rediger konto"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Fyll opp %s (%s) …"
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Fyll opp kreditt for konto"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Fyll opp …"
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Du må slå på en av kontoene for å se kontakter her."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Du må slå på %s for å se kontakter her."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktliste"
 
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Innstillinger for konto"
+
 #: ../src/empathy-roster-window-menubar.ui.h:2
 #: ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation…"
@@ -4066,54 +3952,50 @@ msgid "_Accounts"
 msgstr "_Kontoer"
 
 #: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "_Personal Information"
-msgstr "Personlig _informasjon"
-
-#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokkerte kontakter"
 
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "B_rukervalg"
 
-#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "Find in Contact _List"
 msgstr "Finn i kontakt_liste"
 
-#: ../src/empathy-roster-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Sorter på _navn"
 
-#: ../src/empathy-roster-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Sorter på _status"
 
-#: ../src/empathy-roster-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "Normal Size With _Avatars"
 msgstr "Normal størrelse med _avatarer"
 
-#: ../src/empathy-roster-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "N_ormal Size"
 msgstr "N_ormal størrelse"
 
-#: ../src/empathy-roster-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Kompakt størrelse"
 
-#: ../src/empathy-roster-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "_Rom"
 
-#: ../src/empathy-roster-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Bli med …"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "Join _Favorites"
 msgstr "Bli med i _favoritter"
 
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "Manage Favorites"
 msgstr "HÃ¥ndter favoritter"
 
@@ -4142,6 +4024,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nei"
 
@@ -4197,7 +4084,7 @@ msgid "New conversation"
 msgstr "Ny samtale"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Kontakt kobler til"
 
 #: ../src/empathy-preferences.c:170
@@ -4217,46 +4104,46 @@ msgid "Language"
 msgstr "Språk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Juliet har koblet fra"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Brukervalg"
 
@@ -4273,74 +4160,82 @@ msgid "Appearance"
 msgstr "Utseende"
 
 #: ../src/empathy-preferences.ui.h:4
-msgid "_Open new chats in separate windows"
-msgstr "_Ã…pne nye samtaler i egne vinduer"
+msgid "Start chats in:"
+msgstr "Start prat om:"
 
 #: ../src/empathy-preferences.ui.h:5
+msgid "new ta_bs"
+msgstr "nye fa_ner"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "new _windows"
+msgstr "nye _vinduer"
+
+#: ../src/empathy-preferences.ui.h:7
 msgid "Display incoming events in the notification area"
 msgstr "Vis innkommende hendelser i varslingsområdet"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "_Automatically connect on startup"
 msgstr "Koble til _automatisk ved oppstart"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
 msgid "Log conversations"
 msgstr "Logg samtaler"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
 msgid "Behavior"
 msgstr "Oppførsel"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
 msgid "_Enable bubble notifications"
 msgstr "_Aktiver varsling med bobler"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
 msgid "Disable notifications when _away or busy"
 msgstr "Slå av varsling når du er borte eller oppt_att"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:14
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Aktiver varsling når _prat ikke er fokusert"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
 msgid "Enable notifications when a contact comes online"
 msgstr "Slå på varsling når en kontakt kobler seg til"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:16
 msgid "Enable notifications when a contact goes offline"
 msgstr "Slå på varsling når en kontakt kobler seg fra"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Varsling"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:18
 msgid "_Enable sound notifications"
 msgstr "_Aktiver varsling med lyder"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:19
 msgid "Disable sounds when _away or busy"
 msgstr "Slå av lyder når du er b_orte eller opptatt"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Spill av lyd for hendelser"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "Lyder"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:22
 msgid "Use _echo cancellation to improve call quality"
 msgstr "Bruk _ekkokansellering for å forbedre kvaliteten på samtalen"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Echo cancellation helps to make your voice sound clearer to the other "
 "person, but may cause problems on some computers. If you or the other person "
@@ -4352,11 +4247,11 @@ msgstr ""
 "den andre personen hører rare lyder eller feil under samtaler kan du prøve å "
 "slå av utlikning av ekko og starte samtalen på nytt."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Publish location to my contacts"
 msgstr "_Publiser plassering til mine kontakter"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4366,54 +4261,54 @@ msgstr ""
 "publisert. GPS-koordinater vil ha nøyaktighet lik en desimalplass."
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Reduce location accuracy"
 msgstr "_Reduser nøyaktighet for plassering"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:30
 msgid "Privacy"
 msgstr "Personvern"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:31
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobiltelefon"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Nettverk (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:34
 msgid "Location sources:"
 msgstr "Kilder for steder:"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:36
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Listen med språk viser bare de språkene det er installert ordliste for."
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Slå på stavekontroll for språk:"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "Samtale_tema:"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Variant:"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Temaer"
 
@@ -4477,63 +4372,63 @@ msgstr "Slå på kamera og send video"
 msgid "Contact Map View"
 msgstr "Kartvisning for kontakter"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1585
 msgid "Save"
 msgstr "Lagre"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1761
 msgid "Debug Window"
 msgstr "Feilsøkingsvindu"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1848
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:1860
 msgid "Level "
 msgstr "Nivå "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1879
 msgid "Debug"
 msgstr "Feilsøk"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1884
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:1889 ../src/empathy-debug-window.c:1935
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1894
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:1899
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:1904
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:1923
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1926
 msgid "Domain"
 msgstr "Domene"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:1928
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:1930
 msgid "Level"
 msgstr "Nivå"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:1953
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4553,35 +4448,31 @@ msgstr "Velg en kontakt å invitere til samtalen:"
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Ikke vis noen dialoger. Utfør arbeid (f.eks import) og avslutt"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ikke vis noen dialoger med mindre det kun finnes «Personer i nærheten»-"
 "kontoer"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Velg en gitt konto ved oppstart (f.eks. gabble/jabber/foo_40eksempel_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Vis kontoassistent"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy-kontoer"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-kontoer"
 
@@ -4597,7 +4488,7 @@ msgstr "- Empathy feilsøking"
 msgid "Empathy Debugger"
 msgstr "Empathy feilsøking"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy lynmeldingsprogram"
 
@@ -4606,13 +4497,13 @@ msgid "Respond"
 msgstr "Svar"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Avvis"
 
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "Svar"
 
@@ -4644,38 +4535,38 @@ msgstr "%s prøvde å ringe deg, men du var i en annen samtale."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "PÃ¥ vent"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Demp"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Varighet"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s – %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3214
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Din saldo er %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3218
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Du har ikke nok kreditt til å starte denne samtalen."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3220
 msgid "Top Up"
 msgstr "Fyll opp"
 
@@ -4683,6 +4574,27 @@ msgstr "Fyll opp"
 msgid "_Match case"
 msgstr "Skill _mellom små/store bokstaver"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Hvilken type konto har du?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Legger til ny konto"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Personer i nærheten"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr "Empathy kan oppdage og prate med andre som er koblet på samme nettverk som deg automatisk. Hvis du vil bruke denne funksjonen må du sjekke om detaljene under er riktige."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr "Du kan endre disse detaljene senere eller slå av denne funksjonen ved å velge <span style=\"italic\">Rediger → Kontoer</span> i kontaktlisten."
diff --git a/po/ru.po b/po/ru.po
index 58424a1a3..f9a3f2749 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy trunk\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-12-22 11:35+0000\n"
-"PO-Revision-Date: 2012-01-07 20:04+0300\n"
+"POT-Creation-Date: 2012-02-13 13:31+0000\n"
+"PO-Revision-Date: 2012-02-16 01:20+0300\n"
 "Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,431 +25,454 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Общайте�ь в Google Talk, Facebook, MSN и во многих других �лужбах"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Клиент обмена мгновенными �ообщени�ми"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Программа обмена �ообщени�ми Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Клиент обмена мгновенными �ообщени�ми"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Общайте�ь в Google Talk, Facebook, MSN и во многих других �лужбах"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "В�егда открывать новую бе�еду в новом окне."
+msgid "Connection managers should be used"
+msgstr "И�пользуемые ди�петчеры �оединений"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Камера"
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "И�пользовать ли менеджеры �в�зно�ти дл� автоматиче�кого отключени� или переподключени�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Положение камеры"
+msgid "Empathy should auto-connect on startup"
+msgstr "При�оедин�ть�� при запу�ке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Символ дл� добавлени� по�ле п�евдонима, е�ли в бе�еде и�пользует�� автодополнение п�евдонимов по клавише Tab."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Должен ли Empathy автоматиче�ки входить в ваши учётные запи�и при запу�ке."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Тема окна бе�еды"
+msgid "Empathy should auto-away when idle"
+msgstr "У�танавливать �тату� «от�ут�твует» при бездей�твии"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Вариант тема дл� окна бе�еды"
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Должен ли Empathy автоматиче�ки у�танавливать �тату� «от�ут�твует» при бездей�твии пользовател�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Спи�ок �зыков, и�пользуемых при проверке орфографии, разделённых зап�тыми (например «en, fr, ru»)."
+msgid "Empathy default download folder"
+msgstr "Папка Empathy дл� загрузки файлов"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Компактный �пи�ок �обе�едников"
+msgid "The default folder to save file transfers in."
+msgstr "Каталог по умолчанию дл� �охранени� при�ланных файлов."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "И�пользуемые ди�петчеры �оединений"
+msgid "Show offline contacts"
+msgstr "Показывать от�ут�твующих �обе�едников"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Критерий упор�дочивани� �пи�ка �обе�едников"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Показывать ли �обе�едников не в �ети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "Путь к объекту D-Bus по�ледней учётной запи�и, выбранной дл� при�оединени� к комнате."
+msgid "Show avatars"
+msgstr "Показывать аватары"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Камера, и�пользуема� по умолчанию дл� видеовызовов, напр. /dev/video0."
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Показывать ли аватары �обе�едников в �пи�ке �обе�едников и окнах бе�еды."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Каталог, и�пользуемый дл� выбора изображений аватаров"
+msgid "Show protocols"
+msgstr "Показывать протоколы"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Выключить в�плывающие уведомлени� в �о�то�нии «от�ут�твует»"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Показывать ли протоколы дл� �обе�едников в �пи�ке �обе�едников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Выключить звуки в �о�то�нии «от�ут�твует»"
+msgid "Show Balance in contact list"
+msgstr "Показывать балан� в �пи�ке �обе�едников"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Показывать на�тупающие �обыти� в обла�ти �о�то�ни�"
+msgid "Whether to show account balances in the contact list."
+msgstr "Показывать ли балан�ы учётных запи�ей в �пи�ке �обе�едников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Показывать на�тупающие �обыти� в обла�ти �о�то�ни�. Е�ли ключ не у�тановлен, показывать их непо�ред�твенно пользователю."
+msgid "Compact contact list"
+msgstr "Компактный �пи�ок �обе�едников"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Поддержка подавлени� �ха"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Показывать ли компактный �пи�ок �обе�едников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy может публиковать ме�тоположение пользовател�"
+msgid "Hide main window"
+msgstr "Скрывать главное окно"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy может и�пользовать GPS дл� определени� ме�тоположени�"
+msgid "Hide the main window."
+msgstr "Скрывать главное окно."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy может и�пользовать �отовую �еть дл� определени� ме�тоположени�"
+msgid "Default directory to select an avatar image from"
+msgstr "Каталог, и�пользуемый дл� выбора изображений аватаров"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy может и�пользовать �еть дл� определени� ме�тоположени�"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "По�ледний каталог, из которого выбирали�ь изображени� аватаров."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Папка Empathy дл� загрузки файлов"
+msgid "Open new chats in separate windows"
+msgstr "Открывать новые бе�еды в новом окне"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "У�танавливать �тату� «от�ут�твует» при бездей�твии"
+msgid "Always open a separate chat window for new chats."
+msgstr "В�егда открывать новую бе�еду в новом окне."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "При�оедин�ть�� при запу�ке"
+msgid "Display incoming events in the status area"
+msgstr "Показывать на�тупающие �обыти� в обла�ти �о�то�ни�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy должен �нижать точно�ть ме�тоположени�"
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Показывать на�тупающие �обыти� в обла�ти �о�то�ни�. Е�ли ключ не у�тановлен, показывать их непо�ред�твенно пользователю."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy должен и�пользовать аватар контакта как значок окна � бе�едой"
+msgid "The position for the chat window side pane"
+msgstr "Положение боковой панели окна бе�еды"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Включить ин�трументы разработчика WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Положение боковой панели окна бе�еды (в пик�елах)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Включить в�плывающие уведомлени� о новых �ообщени�х"
+#| msgid "Show contact list in rooms"
+msgid "Show contact groups"
+msgstr "Показывать группы"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Включить проверку орфографии"
+#| msgid "Whether to show account balances in the contact list."
+msgid "Whether to show groups in the contact list."
+msgstr "Показывать ли группы в �пи�ке �обе�едников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Скрывать главное окно"
+msgid "Contact list sort criterion"
+msgstr "Критерий упор�дочивани� �пи�ка �обе�едников"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Скрывать главное окно."
+#, fuzzy
+#| msgid ""
+#| "Which criterion to use when sorting the contact list. Default is to sort "
+#| "by the contact's name with the value \"name\". A value of \"state\" will "
+#| "sort the contact list by state."
+msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name."
+msgstr "Критерий упор�дочивани� �пи�ка �обе�едников. По умолчанию упор�дочивает�� по имени �обе�едника — «name». При значении «state» �пи�ок будет упор�дочен по �тату�у."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "По�ледн�� учётна� запи�ь, выбранна� в диалоге при�оединени� к комнате."
+msgid "Use notification sounds"
+msgstr "И�пользовать звуки"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Символ автодополнени� п�евдонима"
+msgid "Whether to play a sound to notify of events."
+msgstr "Во�производить ли звук дл� уведомлени� о �обыти�х."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Открывать новые бе�еды в новом окне"
+msgid "Disable sounds when away"
+msgstr "Выключить звуки в �о�то�нии «от�ут�твует»"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Путь к и�пользуемой теме Adium"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Во�производить ли звуковые уведомлени� в �о�то�ни�х «от�ут�твует» или «не бе�покоить»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Путь к и�пользуемой теме Adium, е�ли тема, и�пользуема� дл� бе�еды — Adium."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "Во�производить ли звук при получении �ообщени�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Во�производить ли звук при начале бе�еды"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Во�производить ли звук дл� уведомлени� о вход�щих �ообщени�х."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for outgoing messages"
 msgstr "Во�производить ли звук при отправке �ообщени�"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Во�производить ли звук дл� уведомлени� об и�ход�щих �ообщени�х."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Во�производить ли звук при входе контакта в �еть"
+msgid "Play a sound for new conversations"
+msgstr "Во�производить ли звук при начале бе�еды"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Во�производить ли звук при выходе контакта из �ети"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Во�производить ли звук дл� уведомлени� о начале новой бе�еды."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Во�производить звук при входе в �еть"
+msgid "Play a sound when a contact logs in"
+msgstr "Во�производить ли звук при входе контакта в �еть"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Во�производить звук при выходе из �ети"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Во�производить ли звук дл� уведомлени� о входе �обе�едников в �еть."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Показывать в�плывающие уведомлени�, е�ли бе�еда находит�� не в фоку�е"
+msgid "Play a sound when a contact logs out"
+msgstr "Во�производить ли звук при выходе контакта из �ети"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Показывать в�плывающие уведомлени�, когда по�вл�ет�� �обе�едник"
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Во�производить ли звук дл� уведомлени� о выходе �обе�едников из �ети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Показывать в�плывающие уведомлени�, когда �обе�едник уходит"
+msgid "Play a sound when we log in"
+msgstr "Во�производить звук при входе в �еть"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Предварительный про�мотр положени� камеры должен выполн�ть�� в течение вызова."
+msgid "Whether to play a sound when logging into a network."
+msgstr "Во�производить ли звук при входе в �еть."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Показывать балан� в �пи�ке �обе�едников"
+msgid "Play a sound when we log out"
+msgstr "Во�производить звук при выходе из �ети"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Показывать аватары"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Во�производить ли звук при выходе из �ети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Показывать �пи�ок �обе�едников в комнатах"
+msgid "Enable popup notifications for new messages"
+msgstr "Включить в�плывающие уведомлени� о новых �ообщени�х"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Показывать под�казку о закрытии главного окна"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Показывать ли в�плывающее уведомление при получении нового �ообщени�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Показывать от�ут�твующих �обе�едников"
+msgid "Disable popup notifications when away"
+msgstr "Выключить в�плывающие уведомлени� в �о�то�нии «от�ут�твует»"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Показывать протоколы"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Показывать ли в�плывающие уведомлени� в �о�то�ни�х «от�ут�твует» или «не бе�покоить»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Языки дл� проверки орфографии"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Показывать в�плывающие уведомлени�, е�ли бе�еда находит�� не в фоку�е"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Каталог по умолчанию дл� �охранени� при�ланных файлов."
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Показывать ли в�плывающее уведомление о получении нового �ообщени�, когда бе�еда уже ведёт��, но не находит�� в фоку�е."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "По�ледний каталог, из которого выбирали�ь изображени� аватаров."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Показывать в�плывающие уведомлени�, когда по�вл�ет�� �обе�едник"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Положение боковой панели окна бе�еды"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Показывать ли в�плывающее уведомление, когда �обе�едник выходит в �еть."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Положение боковой панели окна бе�еды (в пик�елах)."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Показывать в�плывающие уведомлени�, когда �обе�едник уходит"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Эта тема и�пользует�� дл� отображени� диалога в окне бе�еды."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Показывать ли в�плывающее уведомление, когда �обе�едник выходит из �ети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme variant that is used to display the conversation in chat windows."
-msgstr "Вариант темы, и�пользуемый дл� отображени� бе�ед."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "И�пользовать графиче�кие улыбки"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Преобразовывать ли тек�товые улыбки (�майлы) в бе�едах в графиче�кие изображени�."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "И�пользовать звуки"
+msgid "Show contact list in rooms"
+msgstr "Показывать �пи�ок �обе�едников в комнатах"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "И�пользовать тему дл� бе�ед"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Показывать ли �пи�ок �обе�едников в комнатах."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Может ли Empathy публиковать ме�тоположение пользовател� дл� его �обе�едников."
+msgid "Chat window theme"
+msgstr "Тема окна бе�еды"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Может ли Empathy и�пользовать GPS дл� определени� ме�тоположени�."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Эта тема и�пользует�� дл� отображени� диалога в окне бе�еды."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Может ли Empathy и�пользовать �отовую �еть дл� определени� ме�тоположени�."
+msgid "Chat window theme variant"
+msgstr "Вариант тема дл� окна бе�еды"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Может ли Empathy и�пользовать �еть дл� определени� ме�тоположени�."
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "Вариант темы, и�пользуемый дл� отображени� бе�ед."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Должен ли Empathy автоматиче�ки входить в ваши учётные запи�и при запу�ке."
+msgid "Path of the Adium theme to use"
+msgstr "Путь к и�пользуемой теме Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Должен ли Empathy автоматиче�ки у�танавливать �тату� «от�ут�твует» при бездей�твии пользовател�."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Путь к и�пользуемой теме Adium, е�ли тема, и�пользуема� дл� бе�еды — Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Должен ли Empathy уменьшать точно�ть определени� ме�тоположени� по причинам приватно�ти."
+msgid "Enable WebKit Developer Tools"
+msgstr "Включить ин�трументы разработчика WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "И�пользовать ли аватар �обе�едника в каче�тве значка окна бе�еды."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Должны ли быть включены ин�трументы разработчика WebKit, например Web Inspector."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Inform other users when you are typing to them"
+msgstr "Уведомл�ть пользователей о наборе �ообщений"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "И�пользовать ли менеджеры �в�зно�ти дл� автоматиче�кого отключени� или переподключени�."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Провер�ть ли введённые �лова из �пи�ка �зыков дл� проверки орфографии."
+msgid "Use theme for chat rooms"
+msgstr "И�пользовать тему дл� бе�ед"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Преобразовывать ли тек�товые улыбки (�майлы) в бе�едах в графиче�кие изображени�."
+msgid "Whether to use the theme for chat rooms."
+msgstr "И�пользовать ли темы дл� комнат."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Включить ли фильтр подавлени� �ха Pulseaudio."
+msgid "Spell checking languages"
+msgstr "Языки дл� проверки орфографии"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Во�производить ли звук дл� уведомлени� о входе �обе�едников в �еть."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Спи�ок �зыков, и�пользуемых при проверке орфографии, разделённых зап�тыми (например «en, fr, ru»)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Во�производить ли звук дл� уведомлени� о выходе �обе�едников из �ети."
+msgid "Enable spell checker"
+msgstr "Включить проверку орфографии"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Во�производить ли звук дл� уведомлени� о �обыти�х."
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Провер�ть ли введённые �лова из �пи�ка �зыков дл� проверки орфографии."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Во�производить ли звук дл� уведомлени� о вход�щих �ообщени�х."
+msgid "Nick completed character"
+msgstr "Символ автодополнени� п�евдонима"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Во�производить ли звук дл� уведомлени� о начале новой бе�еды."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Символ дл� добавлени� по�ле п�евдонима, е�ли в бе�еде и�пользует�� автодополнение п�евдонимов по клавише Tab."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Во�производить ли звук дл� уведомлени� об и�ход�щих �ообщени�х."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy должен и�пользовать аватар контакта как значок окна � бе�едой"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Во�производить ли звук при входе в �еть."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "И�пользовать ли аватар �обе�едника в каче�тве значка окна бе�еды."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Во�производить ли звук при выходе из �ети."
+msgid "Last account selected in Join Room dialog"
+msgstr "По�ледн�� учётна� запи�ь, выбранна� в диалоге при�оединени� к комнате."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Во�производить ли звуковые уведомлени� в �о�то�ни�х «от�ут�твует» или «не бе�покоить»."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Путь к объекту D-Bus по�ледней учётной запи�и, выбранной дл� при�оединени� к комнате."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Показывать ли в�плывающее уведомление, когда �обе�едник выходит из �ети."
+msgid "Camera device"
+msgstr "Камера"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Показывать ли в�плывающее уведомление, когда �обе�едник выходит в �еть."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Камера, и�пользуема� по умолчанию дл� видеовызовов, напр. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Показывать ли в�плывающее уведомление о получении нового �ообщени�, когда бе�еда уже ведёт��, но не находит�� в фоку�е."
+msgid "Camera position"
+msgstr "Положение камеры"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Показывать ли в�плывающее уведомление при получении нового �ообщени�."
+msgid "Position the camera preview should be during a call."
+msgstr "Предварительный про�мотр положени� камеры должен выполн�ть�� в течение вызова."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Показывать ли балан�ы учётных запи�ей в �пи�ке �обе�едников."
+msgid "Echo cancellation support"
+msgstr "Поддержка подавлени� �ха"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Показывать ли аватары �обе�едников в �пи�ке �обе�едников и окнах бе�еды."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Включить ли фильтр подавлени� �ха Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Показывать ли �обе�едников не в �ети."
+msgid "Show hint about closing the main window"
+msgstr "Показывать под�казку о закрытии главного окна"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Показывать ли в�плывающие уведомлени� в �о�то�ни�х «от�ут�твует» или «не бе�покоить»."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Показывать ли диалоговое окно при закрытии главного окна � помощью кнопки «x» в �троке заголовка."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Показывать ли протоколы дл� �обе�едников в �пи�ке �обе�едников."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy может публиковать ме�тоположение пользовател�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Показывать ли �пи�ок �обе�едников в комнатах."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Может ли Empathy публиковать ме�тоположение пользовател� дл� его �обе�едников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Показывать ли компактный �пи�ок �обе�едников."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy может и�пользовать �еть дл� определени� ме�тоположени�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Показывать ли диалоговое окно при закрытии главного окна � помощью кнопки «x» в �троке заголовка."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Может ли Empathy и�пользовать �еть дл� определени� ме�тоположени�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "И�пользовать ли темы дл� комнат."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy может и�пользовать �отовую �еть дл� определени� ме�тоположени�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
-msgstr "Критерий упор�дочивани� �пи�ка �обе�едников. По умолчанию упор�дочивает�� по имени �обе�едника — «name». При значении «state» �пи�ок будет упор�дочен по �тату�у."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Может ли Empathy и�пользовать �отовую �еть дл� определени� ме�тоположени�."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Управление учётными запи��ми дл� обмена �ообщени�ми и VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy может и�пользовать GPS дл� определени� ме�тоположени�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Может ли Empathy и�пользовать GPS дл� определени� ме�тоположени�."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy должен �нижать точно�ть ме�тоположени�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Должен ли Empathy уменьшать точно�ть определени� ме�тоположени� по причинам приватно�ти."
 
 #. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2327
 msgid "Messaging and VoIP Accounts"
 msgstr "Учётные запи�и обмена �ообщени�ми и VoIP"
 
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Управление учётными запи��ми дл� обмена �ообщени�ми и VoIP"
+
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
 msgstr "Причина не указана"
@@ -475,7 +498,7 @@ msgid "The other participant is unable to transfer the file"
 msgstr "Собе�едник не может передавать файлы"
 
 #: ../libempathy/empathy-ft-handler.c:754
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "�еизве�тна� причина"
 
@@ -512,170 +535,176 @@ msgstr "Разговор � %s"
 msgid "Call from %s"
 msgstr "Вызов от %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "В �ети"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "�е бе�покоить"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "От�ут�твует"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "�евидимо�ть"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "�е в �ети"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Причина не указана"
 
-#: ../libempathy/empathy-utils.c:285
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "У�тановлен �тату� «не в �ети»"
 
-#: ../libempathy/empathy-utils.c:287
-#: ../libempathy/empathy-utils.c:321
+#: ../libempathy/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:289
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "�утентификаци� не удала�ь"
 
-#: ../libempathy/empathy-utils.c:291
-#: ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Ошибка шифровани�"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Им� уже зан�то"
 
-#: ../libempathy/empathy-utils.c:295
-#: ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Сертификат недо�тупен"
 
-#: ../libempathy/empathy-utils.c:297
-#: ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертификат не �вл�ет�� доверенным"
 
-#: ../libempathy/empathy-utils.c:299
-#: ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертификат у�тарел"
 
-#: ../libempathy/empathy-utils.c:301
-#: ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертификат не активирован"
 
-#: ../libempathy/empathy-utils.c:303
-#: ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Имена узлов �ертификатов не �овпадают"
 
-#: ../libempathy/empathy-utils.c:305
-#: ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Отпечатки �ертификатов не �овпадают"
 
-#: ../libempathy/empathy-utils.c:307
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Сертификат подпи�ан �амо�то�тельно"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Ошибка �ертификата"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Шифрование недо�тупно"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "�еверный �ертификат"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Запро� на подключение отклонён"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "�е удало�ь у�тановить �оединение"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Соединение разорвано"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Этот ре�ур� уже подключён к �ерверу"
-
 #: ../libempathy/empathy-utils.c:355
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "Эта учётна� запи�ь уже подключена к �ерверу"
+
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Подключение было замещено новым подключение � �тим же ре�ур�ом"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Учётна� запи�ь уже �уще�твует на �ервере"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "В на�то�щий момент �ервер �лишком загружен, чтобы обработать подключение."
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертификат аннулирован"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Сертификат и�пользует небезопа�ный алгоритм шифра или криптографиче�ки �лаб"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Длина �ертификата �ервера или глубина цепочки �ертификатов �ервера превышает предел, у�тановленный криптографиче�кой библиотекой"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Слишком �тара� вер�и� приложени�"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+#| msgid "Interval (seconds)"
+msgid "Internal error"
+msgstr "Внутренн�� ошибка"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Люди поблизо�ти"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Япони�"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Бе�еда Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -683,7 +712,7 @@ msgstr[0] "%d �екунду назад"
 msgstr[1] "%d �екунды назад"
 msgstr[2] "%d �екунд назад"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -691,7 +720,7 @@ msgstr[0] "%d минуту назад"
 msgstr[1] "%d минуты назад"
 msgstr[2] "%d минут назад"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -699,7 +728,7 @@ msgstr[0] "%d ча� назад"
 msgstr[1] "%d ча�а назад"
 msgstr[2] "%d ча�ов назад"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -707,7 +736,7 @@ msgstr[0] "%d день назад"
 msgstr[1] "%d дн� назад"
 msgstr[2] "%d дней назад"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -715,7 +744,7 @@ msgstr[0] "%d неделю назад"
 msgstr[1] "%d недели назад"
 msgstr[2] "%d недель назад"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -723,11 +752,11 @@ msgstr[0] "%d ме��ц назад"
 msgstr[1] "%d ме��ца назад"
 msgstr[2] "%d ме��цев назад"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "в будущем"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "В�е учётные запи�и"
 
@@ -750,30 +779,30 @@ msgstr "Сервер"
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Им� пользовател�:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "П_рименить"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Войти"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Эта учётна� запи�ь уже �уще�твует на �ервере"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Создать новую учётную запи�ь на �ервере"
 
@@ -782,137 +811,137 @@ msgstr "Создать новую учётную запиÑ�ÑŒ на Ñ�ерверÐ
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Учётна� запи�ь %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "�ова� учётна� запи�ь"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Пример:</b> MyScreenName"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Пароль:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Дополнительно"
+msgid "Screen _Name:"
+msgstr "_Им�:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Пример:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Пароль:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запомнить пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запомнить пароль"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "П_орт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Запомнить пароль"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Им�:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Какой у ва� пароль AIM?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Дополнительно"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Какое у ва� им� пользовател� AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "П_орт:"
+msgid "What is your AIM password?"
+msgstr "Какой у ва� пароль AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Пример:</b> им�_пользовател�"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запомнить пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_Идентификатор:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Пример:</b> им�_пользовател�"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Какой у ва� ID пользовател� GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Какой у ва� пароль GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Пример:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Кодировка:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Какой у ва� ICQ UIN?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Какой у ва� пароль ICQ?"
 
@@ -949,21 +978,25 @@ msgstr "Options"
 msgid "None"
 msgstr "От�ут�твует"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Сеть"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "Кодировка:"
+msgid "Network:"
+msgstr "Сеть:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "Большин�тво �ерверов IRC не требует парол�, е�ли вы не уверены, то не вводите пароль."
+msgid "Character set:"
+msgstr "Кодировка:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Сеть"
+msgid "Servers"
+msgstr "Серверы"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Сеть:"
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "Большин�тво �ерверов IRC не требует парол�, е�ли вы не уверены, то не вводите пароль."
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -981,48 +1014,20 @@ msgstr "Сообщение при выходе:"
 msgid "Real name:"
 msgstr "�а�то�щее им�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Серверы"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Какой у ва� п�евдоним в IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Кака� �еть IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Пример:</b> пользователь@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Пример:</b> пользователь@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Требует�� шифров_ание (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Игнорировать ошибки �ертификатов SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Замещать на�тройки �ервера"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "При_оритет:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Какой у ва� п�евдоним в IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Ре_�ур�:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Какое у ва� им� пользовател� Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1032,64 +1037,92 @@ msgstr ""
 "Е�ли ваш адре� facebook.com/<b>badger</b>, введите <b>badger</b>.\n"
 "И�пользуйте <a href=\"http://www.facebook.com/username/\">�ту �траницу</a> дл� выбора имени пользовател� Facebook, е�ли у ва� его ещё нет."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "И�пользовать �тарое _шифрование (SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Какой у ва� пароль Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Какое у ва� им� пользовател� Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Какой у ва� Google ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Пример:</b> пользователь@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Какой у ва� пароль Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Пример:</b> пользователь@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Игнорировать ошибки �ертификатов SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "При_оритет:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Ре_�ур�:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Требует�� шифров_ание (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "И�пользовать �тарое _шифрование (SSL)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Замещать на�тройки �ервера"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Какой у ва� Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Какой у ва� пароль Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Какой Jabber ID вы хотите?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Какой у ва� пароль Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Какой пароль Jabber вы хотите?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Пример:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Какой у ва� Windows Live ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Какой у ва� пароль Windows Live?"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+msgid "Nic_kname:"
+msgstr "_П�евдоним:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "�_дре� �л. почты:"
+msgid "_Last Name:"
+msgstr "_Фамили�:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "Nic_kname:"
-msgstr "_П�евдоним:"
+msgid "_First Name:"
+msgstr "_Им�:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_First Name:"
+msgid "_Published Name:"
 msgstr "_Им�:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
@@ -1097,114 +1130,110 @@ msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Фамили�:"
+msgid "E-_mail address:"
+msgstr "�_дре� �л. почты:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
 msgstr "_Им�:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Пример:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Им� пользовател� дл� аутентификации:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Обнаруживать �оединени�"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "�втоматиче�кий пои�к �ервера STUN"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "И�пользовать �ту учётную запи�ь дл� звонков на _обычные и мобильные телефоны"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Игнорировать ошибки TLS"
+msgid "NAT Traversal Options"
+msgstr "Параметры NAT Traversal"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Интервал (в �екундах)"
+msgid "Proxy Options"
+msgstr "Параметры прок�и"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Параметры Keep-Alive"
+msgid "Miscellaneous Options"
+msgstr "Различные параметры"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Свободна� маршрутизаци�"
+msgid "STUN Server:"
+msgstr "Сервер STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механизм:"
+msgid "Discover the STUN server automatically"
+msgstr "�втоматиче�кий пои�к �ервера STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Различные параметры"
+msgid "Discover Binding"
+msgstr "Обнаруживать �оединени�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Параметры NAT Traversal"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Параметры Keep-Alive"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механизм:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Параметры прок�и"
+msgid "Interval (seconds)"
+msgstr "Интервал (в �екундах)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Им� пользовател� дл� аутентификации:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Тран�порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Сервер STUN:"
+msgid "Loose Routing"
+msgstr "Свободна� маршрутизаци�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Сервер:"
+msgid "Ignore TLS Errors"
+msgstr "Игнорировать ошибки TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Тран�порт:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "И�пользовать �ту учётную запи�ь дл� звонков на _обычные и мобильные телефоны"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Какой у ва� пароль учётной запи�и SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Какой у ва� ID входа дл� SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Им�:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Какой у ва� пароль учётной запи�и SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Игнорировать приглашени� к бе�едам и конференци�м"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Локаль �пи�ка бе�ед:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Какой у ва�  Yahoo! ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Какой у ва� пароль Yahoo! ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Локаль �пи�ка бе�ед:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1267,188 +1296,195 @@ msgstr "Срочные телефонные звонки не поддержив
 msgid "You don't have enough credit in order to place this call"
 msgstr "�едо�таточно �ред�тв, чтобы �делать �тот звонок"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "�е удало�ь открыть личную бе�еду"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "В �той бе�еде темы не поддерживают��"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Вы не можете мен�ть тему"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "«%s» не �вл�ет�� допу�тимым идентификатором контакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: очи�тить в�е �ообщени� в текущей бе�еде"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: у�тановить тему текущей бе�еды"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID комнаты>: войти в новую комнату"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID комнаты>: войти в новую комнату"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<ID комнаты>] [<причина>]: покинуть комнату, по умолчанию — текущую"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID контакта> [<�ообщение>]: открыть личную бе�еду"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID контакта> <�ообщение>: открыть личную бе�еду"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <п�евдоним>: изменить п�евдоним на текущем �ервере"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <�ообщение>: отправить �ообщение о ДЕЙСТВИИ"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <�ообщение>: отправить <�ообщение> в текущей бе�еде. И�пользует�� дл� отправки �ообщени�, начинающего�� � «/». �апример: «/say /join и�пользует�� дл� входа в новую комнату»"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID контакта>: показать информацию о контакте"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<команда>]: показать в�е поддерживаемые команды. Е�ли <команда> определена, показать её и�пользование."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "И�пользование: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "�еизве�тна� команда"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "�еизве�тна� команда; дл� в�ех до�тупных команд �м. /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "недо�таточно �ред�тв дл� отправки �ообщени�"
 
-#: ../libempathy-gtk/empathy-chat.c:1460
-#: ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568
+#: ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Ошибка при отправке �ообщени� «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
-#: ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570
+#: ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Ошибка при отправке �ообщени�: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "недо�таточно �ред�тв дл� отправки �ообщени�. <a href='%s'>Пополнить</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "не поддерживает��"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "не в �ети"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "неверный �обе�едник"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "отказано"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "�лишком длинное �ообщение"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "�та возможно�ть не �анкционирована"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "неизве�тно"
 
-#: ../libempathy-gtk/empathy-chat.c:1598
-#: ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706
+#: ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr "Пользователь %s у�тановил тему: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Тема не у�тановлена"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(�ет предположений)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Добавить «%s» в �ловарь"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Добавить «%s» в �ловарь «%s»"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "В�тавить улыбку"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "От_править"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Варианты правопи�ани�"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "�е удало�ь получить по�ледние журналы"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s отключил��"
@@ -1456,12 +1492,12 @@ msgstr "%s отключил��"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s выгнал %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s выгнали"
@@ -1469,17 +1505,17 @@ msgstr "%s выгнали"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s забанил %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s забанили"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s покинул бе�еду"
@@ -1489,17 +1525,17 @@ msgstr "%s покинул бе�еду"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s при�оединил�� к бе�еде"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s теперь изве�тен как %s"
@@ -1507,58 +1543,58 @@ msgstr "%s теперь изве�тен как %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../libempathy-gtk/empathy-chat.c:2993
 #: ../src/empathy-streamed-media-window.c:1889
 #: ../src/empathy-event-manager.c:1280
-#: ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588
-#: ../src/empathy-call-window.c:2631
+#: ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595
+#: ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "От�оединён"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Хотите запомнить �тот пароль?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Запомнить"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "�е �ейча�"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Повторить"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "�еправильный пароль. Попробуйте �нова:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Эта комната защищена паролем:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Войти"
 
-#: ../libempathy-gtk/empathy-chat.c:3901
+#: ../libempathy-gtk/empathy-chat.c:4070
 #: ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Соединён"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Бе�еда"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1590,10 +1626,10 @@ msgstr "Изменить заблокированных �обе�едников
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Учётна� запи�ь:"
 
@@ -1603,7 +1639,7 @@ msgstr "Заблокированные �обе�едники"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Удалить"
@@ -1626,33 +1662,29 @@ msgstr "_Открыть ��ылку"
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Лична� информаци�"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "�овый �обе�едник"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Заблокировать %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Уверены, что хотите заблокировать «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Заблокировать"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1661,17 +1693,17 @@ msgstr[1] "_Пожаловать�� на �тих �обе�едников"
 msgstr[2] "_Пожаловать�� на �тих �обе�едников"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Решить _позже"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Запро� на подпи�ку"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Заблокировать пользовател�"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Решить _позже"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1826,7 +1858,7 @@ msgstr "Вы�ота:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Ме�тоположение"
 
@@ -1843,15 +1875,26 @@ msgid "%B %e, %Y at %R UTC"
 msgstr "%e %b %Y в %R UTC"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:999
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Сохранить аватар"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:1055
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "�еудало�ь �охранить аватар"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+#| msgid "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:3
+msgid "Contact Details"
+msgstr "Информаци� о �обе�еднике"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Полное им�:"
@@ -1917,68 +1960,63 @@ msgstr "почтовый"
 msgid "parcel"
 msgstr "по�ылка"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Ме�тоположение</b> от (дата)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Идентификатор:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "П�евдоним:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Информаци� о клиенте"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Программа-клиент:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Ме�тоположение</b> от (дата)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Информаци� о �обе�еднике"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Информаци� запрошена..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
-msgid "Identifier:"
-msgstr "Идентификатор:"
+msgid "Client Information"
+msgstr "Информаци� о клиенте"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Информаци� запрошена..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "Операционна� �и�тема:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Вер�и�:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Программа-клиент:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Группы"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
 msgstr "Выберите группы, в которых должен по�вить�� �обе�едник. Можно выбрать больше одной группы или не выбирать вообще."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Добавить группу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Выбрать"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1949
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1951
 msgid "Group"
 msgstr "Группа"
 
@@ -2000,165 +2038,150 @@ msgstr[2] "Следующих �обе�едников нельз� заблок
 msgid "Edit Contact Information"
 msgstr "Редактировать информацию о �обе�еднике"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Объединённые контакты"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Выбрать контакты дл� �в�зи"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Предпро�мотр нового �обе�едника"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Контакты, выбранные в �пи�ке �лева, будут объединены."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Выберите учётную запи�ь дл� вызова"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Вызов"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Рабочий"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "ДОМ�Ш�ИЙ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Заблокировать �обе�едника"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Разговор"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS:"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_�удиовызов"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Видеовызов"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Предыдущие _бе�еды"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Отправить файл"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Предо�тавить до�туп к моему рабочему �толу"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Избранный"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts не у�тановлен"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Чтобы получить до�туп к �ведени�м о пользовател�х, у�тановите gnome-contacts"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Информ_аци�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Правка"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Объединить контакты…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1175
 msgid "Inviting you to this room"
 msgstr "Приглашение в комнату"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Пригла�ить в комнату"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-main-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Добавить �обе�едника…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Удалить и _заблокировать"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Вы хотите удалить группу «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Удаление группы"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Дей�твительно хотите удалить �обе�едника «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "Дей�твительно удалить �в�занный контакт «%s»? Это приведёт к удалению в�ех контактов, которые �вл�ют�� ча�тью �того �в�занного контакта."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Удаление �обе�едника"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2170,23 +2193,23 @@ msgstr[2] "Св�занные контакты, �одержащие %u конт
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Ме�тоположение</b> от (дата)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "В �ети � помощью телефона или мобильного у�трой�тва"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "�ова� �еть"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Выберите �еть IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_Сбро�ить �пи�ок �етей"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Выбрать"
@@ -2199,44 +2222,6 @@ msgstr "новый �ервер"
 msgid "SSL"
 msgstr "Шифрование SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Св�зь � �обе�едниками"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Разъединить…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "Полно�тью разъединить �в�занные контакты на отдельные контакты."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Св�зь"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Разъединить контакты «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
-msgstr "Дей�твительно разъединить �ти �в�занные контакты? Это полно�тью разделит �в�занные контакты на отдельные контакты."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Разъединить"
-
 #: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "И�тори�"
@@ -2339,7 +2324,7 @@ msgid "Text chats"
 msgstr "Тек�товые чаты"
 
 #: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Вызовы"
 
@@ -2372,43 +2357,43 @@ msgid "Delete from:"
 msgstr "Удалить из:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Загрузка…</span>"
+msgid "_File"
+msgstr "_Файл"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Разговор"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Правка"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Удалить в�ю и�торию…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Профиль"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Видео"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Разговор"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Правка"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Видео"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Файл"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "�траница 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Загрузка…</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Указанный �обе�едник не находит�� в �ети"
@@ -2540,20 +2525,20 @@ msgid "Find:"
 msgstr "�айти:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "У_читывать реги�тр"
+msgid "_Previous"
+msgstr "_�азад"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Фраза не найдена"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Далее"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "У_читывать реги�тр"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_�азад"
+msgid "Phrase not found"
+msgstr "Фраза не найдена"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2599,12 +2584,12 @@ msgstr "Вызов завершён"
 msgid "Edit Custom Messages"
 msgstr "Изменить на�траиваемые �ообщени�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Сообщение изменено %s "
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Обычна�"
 
@@ -2679,39 +2664,44 @@ msgid "Certificate hostname: %s"
 msgstr "Им� узла �ертификата: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Продолжить"
+#| msgid "Continue"
+msgid "C_ontinue"
+msgstr "_Продолжить"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "�едоверенное �оединение"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Данное �оединение не �вл�ет�� доверенным. В�ё равно продолжить?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запомнить выбор дл� по�ледующих �оединений"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Подробно�ти о �ертификате"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "�евозможно открыть URL"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Выберите файл"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "�едо�таточно �вободного ме�та дл� �охранени� файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "Дл� �охранени� �того файла требует�� %s �вободного ме�та, но до�тупно только %s. Выберите другое ме�тоположение."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Вход�щий файл от %s"
@@ -2968,7 +2958,7 @@ msgid "You can either go back and try to enter your accounts' details again or q
 msgstr "Вы можете вернуть�� назад и попытать�� вве�ти информацию об учётной запи�и ещё раз, или закрыть �тот ма�тер и добавить учётные запи�и позже из меню «Правка»."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1276
 msgid "An error occurred"
 msgstr "Произошла ошибка"
 
@@ -3026,8 +3016,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Выберите учётные запи�и дл� импортировани�:"
 
 #: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "Да"
 
@@ -3040,7 +3030,7 @@ msgid "Empathy can automatically discover and chat with the people connected on
 msgstr "Empathy может автоматиче�ки найти людей, подключённых к той же �ети, что и вы. Е�ли вы хотите и�пользовать �ту возможно�ть, отметьте, что информаци�, пред�тавленна� ниже �вл�ет�� корректной. Вы можете изменить �ту информацию позже или отключить �ту возможно�ть, и�пользу� диалоговое окно «Учётные запи�и»."
 
 #: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
+#: ../src/empathy-account-assistant.c:1152
 msgid "Edit->Accounts"
 msgstr "Правка->Учётные запи�и"
 
@@ -3048,27 +3038,27 @@ msgstr "Правка->Учётные запи�и"
 msgid "I do _not want to enable this feature for now"
 msgstr "_Я не хочу �ейча� включать �ту возможно�ть"
 
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1148
 msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
 msgstr "Вы не можете общать�� � людьми, подключёнными к вашей локальной �ети, т. к. telepathy-salut не у�тановлен. Е�ли вы хотите включить �ту возможно�ть, у�тановите пакет telepathy-salut и �оздайте учётную запи�ь «Люди поблизо�ти» в диалоговом окне «Учётные запи�и»"
 
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1154
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut не у�тановлен"
 
-#: ../src/empathy-account-assistant.c:1198
+#: ../src/empathy-account-assistant.c:1200
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Ма�тер учётных запи�ей обмена �ообщени�ми и VoIP"
 
-#: ../src/empathy-account-assistant.c:1232
+#: ../src/empathy-account-assistant.c:1234
 msgid "Welcome to Empathy"
 msgstr "Добро пожаловать в Empathy"
 
-#: ../src/empathy-account-assistant.c:1241
+#: ../src/empathy-account-assistant.c:1243
 msgid "Import your existing accounts"
 msgstr "Импортировать �уще�твующие учётные запи�и"
 
-#: ../src/empathy-account-assistant.c:1259
+#: ../src/empathy-account-assistant.c:1261
 msgid "Please enter personal details"
 msgstr "Введите пер�ональную информацию"
 
@@ -3085,61 +3075,60 @@ msgstr "Ð’ учётной запиÑ�и %s имеютÑ�Ñ� неÑ�охранённÑ
 msgid "Your new account has not been saved yet."
 msgstr "Ваша нова� учётна� запи�ь ещё не была �охранена."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:344
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Соединение…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:385
 #, c-format
 msgid "Offline — %s"
 msgstr "�е в �ети — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:397
 #, c-format
 msgid "Disconnected — %s"
 msgstr "От�оединён — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:408
 msgid "Offline — No Network Connection"
 msgstr "�е в �ети — подключение к �ети от�ут�твует"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:415
 msgid "Unknown Status"
 msgstr "�еизве�тный �тату�"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:427
 msgid "Offline — Account Disabled"
 msgstr "�е в �ети — учётна� запи�ь отключена"
 
-#: ../src/empathy-accounts-dialog.c:538
-#| msgid "Connection has been refused"
+#: ../src/empathy-accounts-dialog.c:530
 msgid "Edit Connection Parameters"
 msgstr "Изменить параметры �оединени�"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:693
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Сбой при получении пер�ональных данных � �ервера."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:699
 msgid "Go online to edit your personal information."
 msgstr "Выйти в онлайн, чтобы изменить пер�ональные данные"
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:784
 msgid "_Edit Connection Parameters..."
 msgstr "_Изменить параметры �оединени�…"
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../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:1297
+#: ../src/empathy-accounts-dialog.c:1293
 msgid "This will not remove your account on the server."
 msgstr "Это не приведёт к удалению вашей учётной запи�и � �ервера."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../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?"
@@ -3148,15 +3137,15 @@ msgstr ""
 "к отмене �деланных изменений. Хотите продолжить?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1705
 msgid "_Enable"
 msgstr "_Включить"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1706
 msgid "_Disable"
 msgstr "_Отключить"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../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?"
@@ -3168,25 +3157,25 @@ 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."
 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:286
 msgid " - Empathy authentication client"
@@ -3201,12 +3190,12 @@ msgid "People nearby"
 msgstr "Люди поблизо�ти"
 
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr " — клиент Empathy дл� аудио и видео"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:218
+#: ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Клиент Empathy дл� аудио и видео"
 
@@ -3249,33 +3238,33 @@ msgstr "Подробно�ти"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Разговор � %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "IP-адре�, определённый хо�том"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-адре�, определённый �ервером в Интернете"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-адре� точки, определённый � другой �тороны"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "IP-адре� ретран�лирующего �ервера"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "Широковещательный IP-адре� группы"
 
@@ -3294,210 +3283,247 @@ msgid "Connected — %d:%02dm"
 msgstr "Соединён — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Информаци� о �обе�еднике"
 
 #: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Программное обе�печение %s не понимает аудиоформаты, поддерживаемые вашим компьютером"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Программное обе�печение %s не понимает видеоформаты, поддерживаемые вашим компьютером"
 
 #: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "�е удало�ь у�тановить �оединение � %s. Один из ва� может находить�� в �ети, котора� не поддерживает пр�мые подключени�."
 
 #: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "Сбой �ети"
 
 #: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-call-window.c:3100
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "�удиоформаты, необходимые дл� �того вызова, не у�тановлены на вашем компьютере"
 
 #: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-call-window.c:3103
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Видеоформаты, необходимые дл� �того вызова, не у�тановлены на вашем компьютере"
 
 #: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Что-то неожиданное �лучило�ь � компонентом Telepathy. <a href=\"%s\">Сообщите об �той ошибке</a> и прикрепите журналы, �обранные из окна отладки в меню «Справка»."
 
 #: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "Сбой в движке вызова"
 
 #: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "До�тигнут конец потока"
 
 #: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "�е удало�ь у�тановить аудиопоток"
 
 #: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "�е удало�ь у�тановить видеопоток"
 
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-preferences.ui.h:2
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "�удио"
+msgid "_Call"
+msgstr "_Вызов"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Декодер:"
+msgid "_Microphone"
+msgstr "_Микрофон"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Отключить камеру"
+msgid "_Camera"
+msgstr "_Камера"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Показывать панель набора"
+msgid "_Settings"
+msgstr "_Параметры"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кодер:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Вид"
 
 #: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Сбро�ить"
+#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Справка"
 
 #: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Завершить текущий вызов"
+#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Содержание"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Локальный кандидат:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "О_тладка"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Мак�имальный размер"
+msgid "Swap camera"
+msgstr "Сменить камеру"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Минимальный размер"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Удалённый кандидат:"
+msgid "Maximise me"
+msgstr "Мак�имальный размер"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Передавать звук"
+msgid "Disable camera"
+msgstr "Отключить камеру"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Передавать видео"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Сбро�ить"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Показывать панель набора"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Завершить текущий вызов"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Видеовызов"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "�ачать видеовызов"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "�ачать аудиовызов"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Сменить камеру"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Включить или выключить передачу звука"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Включить или выключить передачу видео"
+msgid "Show dialpad"
+msgstr "Показывать панель набора"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580
-#: ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "�еизве�тно"
+msgid "Display the dialpad"
+msgstr "Показывать панель набора"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Передавать видео"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Видеовызов"
+msgid "Toggle video transmission"
+msgstr "Включить или выключить передачу видео"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Вызов"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Передавать звук"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Камера"
-
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Содержание"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Включить или выключить передачу звука"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "О_тладка"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Кодер:"
+
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2587
+#: ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589
+#: ../src/empathy-call-window.c:2590
+msgid "Unknown"
+msgstr "�еизве�тно"
 
 #: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Справка"
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Декодер:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Микрофон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Удалённый кандидат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Параметры"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Локальный кандидат:"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Вид"
+msgid "Audio"
+msgstr "�удио"
+
+#: ../src/empathy-chat-window.c:285
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "Закрыть �то окно?"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr "Е�ли вы закроете окно, то выйдете из комнаты %s. Вы не будете получать �ообщени�, пока не войдёте в комнату. "
 
-#: ../src/empathy-chat-window.c:481
-#: ../src/empathy-chat-window.c:501
+#: ../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 комнат. Вы не будете получать �ообщени�, пока не войдёте в комнаты."
+
+#: ../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)"
@@ -3505,7 +3531,7 @@ msgstr[0] "%s (%d непрочитанное)"
 msgstr[1] "%s (%d непрочитанных)"
 msgstr[2] "%s (%d непрочитанных)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3513,7 +3539,7 @@ msgstr[0] "%s (и %u другой)"
 msgstr[1] "%s (и %u других)"
 msgstr[2] "%s (и %u других)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3521,7 +3547,7 @@ msgstr[0] "%s (%d непрочитанное от других)"
 msgstr[1] "%s (%d непрочитанных от других)"
 msgstr[2] "%s (%d непрочитанных от других)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3529,11 +3555,11 @@ msgstr[0] "%s (%d непрочитанное ото в�ех)"
 msgstr[1] "%s (%d непрочитанных ото в�ех)"
 msgstr[2] "%s (%d непрочитанных ото в�ех)"
 
-#: ../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"
@@ -3541,70 +3567,70 @@ msgstr[0] "Отправка %d �ообщени�"
 msgstr[1] "Отправка %d �ообщений"
 msgstr[2] "Отправка %d �ообщений"
 
-#: ../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-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Показывать �пи�ок �обе�едников"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Передвинуть вкладку в_право"
+msgid "Invite _Participant…"
+msgstr "Пригла�ить _уча�тника…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Уведомл�ть обо в�ех �ообщени�х"
+msgid "C_ontact"
+msgstr "Со_бе�едник"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Бе�еда"
+msgid "_Tabs"
+msgstr "В_кладки"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_От�оединить вкладку"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Избранна� комната"
+msgid "_Previous Tab"
+msgstr "�а пред_ыдущую вкладку"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "�а �лед_ующую вкладку"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "�а пред_ыдущую вкладку"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Во��тановить закрытую вкладку"
 
-#: ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Показывать �пи�ок �обе�едников"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Передвинуть вкладку в_лево"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "В_кладки"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Передвинуть вкладку в_право"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Во��тановить закрытую вкладку"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_От�оединить вкладку"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3618,7 +3644,7 @@ msgstr "Комната"
 msgid "Auto-Connect"
 msgstr "�втоматиче�кое �оединение"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Управление избранными комнатами"
 
@@ -3627,7 +3653,7 @@ msgid "Incoming video call"
 msgstr "Вход�щий видеовызов"
 
 #: ../src/empathy-event-manager.c:523
-#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "Вход�щий вызов"
 
@@ -3644,7 +3670,7 @@ msgstr "%s вызывает ва�. Хотите ответить?"
 #: ../src/empathy-event-manager.c:531
 #: ../src/empathy-event-manager.c:732
 #: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Вход�щий вызов от %s"
@@ -3664,7 +3690,7 @@ msgstr "Ответить � _видео"
 
 #: ../src/empathy-event-manager.c:732
 #: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Вход�щий видеовызов от %s"
@@ -3688,7 +3714,7 @@ msgid "_Decline"
 msgstr "_Отклонить"
 
 #: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Войти"
 
@@ -3708,7 +3734,7 @@ msgid "Incoming file transfer from %s"
 msgstr "Вход�щий файл от %s"
 
 #: ../src/empathy-event-manager.c:1147
-#: ../src/empathy-main-window.c:375
+#: ../src/empathy-roster-window.c:372
 msgid "Password required"
 msgstr "Требует�� пароль"
 
@@ -3861,153 +3887,168 @@ msgstr "Протокол"
 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:635
+#: ../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:743
+#: ../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-main-window.c:811
+#: ../src/empathy-roster-window.c:831
 msgid "Update software..."
 msgstr "Обновить приложение…"
 
-#: ../src/empathy-main-window.c:817
-#: ../src/empathy-main-window.c:938
+#: ../src/empathy-roster-window.c:837
+#: ../src/empathy-roster-window.c:954
 msgid "Close"
 msgstr "Закрыть"
 
-#: ../src/empathy-main-window.c:926
+#: ../src/empathy-roster-window.c:942
 msgid "Reconnect"
 msgstr "Переподключить��"
 
-#: ../src/empathy-main-window.c:932
+#: ../src/empathy-roster-window.c:948
 msgid "Edit Account"
 msgstr "Правка учётной запи�и"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1071
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1092
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Пополнить %s (%s)…"
 
-#: ../src/empathy-main-window.c:1118
+#: ../src/empathy-roster-window.c:1138
 msgid "Top up account credit"
 msgstr "Пополнить кредит �чёта"
 
 #. top up button
-#: ../src/empathy-main-window.c:1189
+#: ../src/empathy-roster-window.c:1210
 msgid "Top Up..."
 msgstr "Пополнить…"
 
-#: ../src/empathy-main-window.c:1931
+#: ../src/empathy-roster-window.c:1933
 msgid "Contact"
 msgstr "Собе�едник"
 
-#: ../src/empathy-main-window.c:2306
+#: ../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:369
 msgid "Chat Room"
@@ -4019,7 +4060,7 @@ msgstr "Уча�тники"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4032,43 +4073,43 @@ msgstr ""
 "Требует�� пароль: %s\n"
 "Уча�тники: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�ет"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "�е удало�ь начать формирование �пи�ка комнат"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "�е удало�ь о�тановить формирование �пи�ка комнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "�е удало�ь загрузить �пи�ок комнат"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Войти в комнату"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "Введите им� бе�еды, к которой хотите при�оединить��, или выберите одну (или более) в �пи�ке."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Комната:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
 msgstr "Введите �ервер бе�еды, или о�тавьте пу�тым, е�ли бе�еда находит�� на �ервере текущей учётной запи�и"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Войти в комнату"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "�е удало�ь загрузить �пи�ок комнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Спи�ок комнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Комната:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Сообщение получено"
@@ -4082,7 +4123,8 @@ msgid "New conversation"
 msgstr "�ова� бе�еда"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+#| msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Собе�едник вошёл в �еть"
 
 #: ../src/empathy-preferences.c:170
@@ -4102,245 +4144,253 @@ msgid "Language"
 msgstr "Язык"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Джульета"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Ромео"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ромео, о зачем же ты Ромео!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Покинь отца и отреки�ь навеки"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "От имени родного, а не хочешь —"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Так покл�ни�ь, что любишь ты мен�, —"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "И больше � не буду Капулетти."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Джульета отключила�ь"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Параметры"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Показывать _графиче�кие улыбки"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Показывать _�пи�ок �обе�едников в комнатах"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Внешний вид"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Поведение"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Тема оформлени� бе�еды:"
+msgid "new ta_bs"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "В_ыключить уведомлени� в �о�то�нии «от�ут�твует» или «не бе�покоить»"
+msgid "new _windows"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "В_ыключить звуки в �о�то�нии «от�ут�твует» или «не бе�покоить»"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Показывать приближающие�� �обыти� в обла�ти уведомлений"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_�втоматиче�ки �оедин�ть�� при запу�ке"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
-msgstr "Подавление �ха позвол�ет �делать передачу вашего голо�а чище, но �то может вызывать проблемы на некоторых компьютерах. Е�ли вы или ваш �обе�едник �лышите �транные шумы или �бои во врем� разговора, попробуйте выключить подавление �ха и повторить вызов �обе�едника."
+msgid "Log conversations"
+msgstr "Ве�ти журнал бе�ед"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Включить уведомлени�, когда �обе�едник по�вл�ет�� в �ети"
+msgid "Behavior"
+msgstr "Поведение"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Включить уведомлени�, когда �обе�едник выходит из �ети"
+msgid "General"
+msgstr "Общие"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Включить уведомлени�, когда _бе�еда не в фоку�е"
+msgid "_Enable bubble notifications"
+msgstr "Включить _в�плывающие уведомлени�"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Включить проверку орфографии дл� �зыков:"
+msgid "Disable notifications when _away or busy"
+msgstr "В_ыключить уведомлени� в �о�то�нии «от�ут�твует» или «не бе�покоить»"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Общие"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Включить уведомлени�, когда _бе�еда не в фоку�е"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Включить уведомлени�, когда �обе�едник по�вл�ет�� в �ети"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "И�точники ме�тоположений:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Включить уведомлени�, когда �обе�едник выходит из �ети"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Ве�ти журнал бе�ед"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Уведомлени�"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Включить звуковые уведомлени�"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Во�производить звук дл� �обытий"
+msgid "Disable sounds when _away or busy"
+msgstr "В_ыключить звуки в �о�то�нии «от�ут�твует» или «не бе�покоить»"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Приватно�ть"
+msgid "Play sound for events"
+msgstr "Во�производить звук дл� �обытий"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
-msgstr "Примерное определение ме�тоположени� означает, что публикует�� только ваш город, регион и �трана. Координаты GPS будут отображать�� � точно�тью до 1 знака по�ле зап�той."
+msgid "Sounds"
+msgstr "Звуки"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Показывать _графиче�кие улыбки"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "И�пользовать подавление _�ха дл� улучшени� каче�тва �в�зи"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Показывать _�пи�ок �обе�едников в комнатах"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "Звуки"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Проверка орфографии"
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Подавление �ха позвол�ет �делать передачу вашего голо�а чище, но �то может вызывать проблемы на некоторых компьютерах. Е�ли вы или ваш �обе�едник �лышите �транные шумы или �бои во врем� разговора, попробуйте выключить подавление �ха и повторить вызов �обе�едника."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr "В �том �пи�ке показаны только те �зыки, дл� которых у�тановлены �ловари."
+msgid "_Publish location to my contacts"
+msgstr "Пу_бликовать ме�тоположение дл� �обе�едников"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Темы"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "И�пользовать подавление _�ха дл� улучшени� каче�тва �в�зи"
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
+msgstr "Примерное определение ме�тоположени� означает, что публикует�� только ваш город, регион и �трана. Координаты GPS будут отображать�� � точно�тью до 1 знака по�ле зап�той."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "Вариант:"
+msgid "_Reduce location accuracy"
+msgstr "_Снижать точно�ть определени� ме�тоположени�"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "_�втоматиче�ки �оедин�ть�� при запу�ке"
+msgid "Privacy"
+msgstr "Приватно�ть"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "С_отова� �еть"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "Включить _в�плывающие уведомлени�"
+msgid "_Cellphone"
+msgstr "С_отова� �еть"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Включить звуковые уведомлени�"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "С_еть (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "И�точники ме�тоположений:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Открывать новые бе�еды в отдельном окне"
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "В �том �пи�ке показаны только те �зыки, дл� которых у�тановлены �ловари."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "Пу_бликовать ме�тоположение дл� �обе�едников"
+msgid "Enable spell checking for languages:"
+msgstr "Включить проверку орфографии дл� �зыков:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Проверка орфографии"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "_Снижать точно�ть определени� ме�тоположени�"
+msgid "Chat Th_eme:"
+msgstr "_Тема оформлени� бе�еды:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Вариант:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Темы"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Со�то�ние"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "В_ыход"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Перезвонить �обе�еднику"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Камера выключена"
+msgid "Redial"
+msgstr "Перезвонить"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Камера включена"
+msgid "V_ideo"
+msgstr "В_идео"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Видео выключено"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Выключить камеру и о�тановить отправку видео"
+msgid "Video Preview"
+msgstr "Предварительный про�мотр видео"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Включить камеру и отправить видео"
+msgid "Video On"
+msgstr "Видео включено"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Включить камеру, но не отправл�ть видео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Перезвонить �обе�еднику"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Предварительный про�мотр"
+msgid "Camera Off"
+msgstr "Камера выключена"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Перезвонить"
+msgid "Disable camera and stop sending video"
+msgstr "Выключить камеру и о�тановить отправку видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "В_идео"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Предварительный про�мотр"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Видео выключено"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Включить камеру, но не отправл�ть видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Видео включено"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Камера включена"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Предварительный про�мотр видео"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Включить камеру и отправить видео"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
@@ -4469,13 +4519,13 @@ msgid "Respond"
 msgstr "Ответить"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Отказать"
 
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "Ответить"
 
@@ -4507,39 +4557,39 @@ msgstr "СобеÑ�едник %s попыталÑ�Ñ� до ваÑ� дозвонитÑ
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1179
+#: ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "Инфо"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "Удержание"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Приглушить"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Длительно�ть"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3214
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Текущий балан�: %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3218
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "�едо�таточно �ред�тв дл� �овершени� звонка."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3220
 msgid "Top Up"
 msgstr "Пополнить"
 
@@ -4548,10 +4598,62 @@ msgid "_Match case"
 msgstr "_Учитывать реги�тр"
 
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
-#| msgid "New account"
 msgid "Adding new account"
 msgstr "Добавление учётной запи�и"
 
+#~ msgid "Personal Information"
+#~ msgstr "Лична� информаци�"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Объединённые контакты"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Выбрать контакты дл� �в�зи"
+
+#~ msgid "New contact preview"
+#~ msgstr "Предпро�мотр нового �обе�едника"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Контакты, выбранные в �пи�ке �лева, будут объединены."
+#~ msgctxt "Link individual (contextual menu)"
+
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Объединить контакты…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Св�зь � �обе�едниками"
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink…"
+#~ msgstr "_Разъединить…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Полно�тью разъединить �в�занные контакты на отдельные контакты."
+
+#~ msgid "_Link"
+#~ msgstr "_Св�зь"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Разъединить контакты «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Дей�твительно разъединить �ти �в�занные контакты? Это полно�тью разделит "
+#~ "�в�занные контакты на отдельные контакты."
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink"
+#~ msgstr "_Разъединить"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Лична� информаци�"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Открывать новые бе�еды в отдельном окне"
+
 #~ msgid "My Web Accounts"
 #~ msgstr "Мои �етевые учётные запи�и"
 
diff --git a/po/sl.po b/po/sl.po
index 7a69de31b..1c8d9221c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,21 +4,21 @@
 #
 # Bernard Banko <bernard.banko afna t-2.net>, 2009.
 # Andrej Žnidarši� <andrej.znidarsic@gmail.com>, 2010.
-# Matej Urban�i� <mateju@svn.gnome.org>, 2006 - 2011.
+# Matej Urban�i� <mateju@svn.gnome.org>, 2006 - 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-11-25 16:24+0000\n"
-"PO-Revision-Date: 2011-11-25 21:04+0100\n"
+"POT-Creation-Date: 2012-02-02 12:58+0000\n"
+"PO-Revision-Date: 2012-02-02 20:51+0100\n"
 "Last-Translator: Matej Urban�i� <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenš�ina <gnome-si@googlegroups.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0)\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -436,8 +436,8 @@ msgid "Whether to use the theme for chat rooms."
 msgstr "Ali naj se za klepetalnice uporablja tema."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
-msgstr "Kateri kriterij naj se uporabi za razvrš�anje seznama stikov. Privzeto je razvrš�anje po imenu stika z vrednostjo \"ime\". Vrednost \"stanje\" pa razvrsti seznam glede na stanje stikov."
+msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name."
+msgstr "Kateri kriterij naj se uporabi za razvrš�anje seznama stikov. Privzeto je razvrš�anje po stanju stika z vrednostjo \"stanje\". Vrednost \"ime\" pa razvrsti seznam poimensko."
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
@@ -445,23 +445,52 @@ msgstr "Upravljanje s sporo�anjem in ra�uni VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2312
+#: ../src/empathy-accounts-dialog.c:2327
 msgid "Messaging and VoIP Accounts"
 msgstr "Sporo�anje in ra�uni VoIP"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Ni navedenega vzroka"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Zahtevana je bila zamenjava stanja"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Prenos datoteke ste preklicali"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Drug uporabnik je preklical prenos datoteke"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Prišlo je do napake med prenosom datoteke"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Drug uporabnik ne more prenesti datoteke"
+
+#: ../libempathy/empathy-ft-handler.c:754
+#: ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Neznan vzrok"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Prenos datoteke je kon�an, vendar je datoteka pokvarjena"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Prenos datotek s strani oddaljenega stika ni podprt"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Izbrana datoteka ni obi�ajna datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Izbrana datoteka je prazna"
 
@@ -482,203 +511,174 @@ msgstr "Klicanje uporabnika %s"
 msgid "Call from %s"
 msgstr "Klic uporabnika %s"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "Vrsta vti�nice ni podprta"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "Ni navedenega vzroka"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "Zahtevana je bila zamenjava stanja"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "Prenos datoteke ste preklicali"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "Drug uporabnik je preklical prenos datoteke"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "Prišlo je do napake med prenosom datoteke"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "Drug uporabnik ne more prenesti datoteke"
-
-#: ../libempathy/empathy-tp-file.c:395
-#: ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Neznan vzrok"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Na voljo"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Zaposleno"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Odsotno"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Nevidno"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Nepovezano"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ni dolo�enega razloga"
 
-#: ../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 nastavljeno na brez povezave"
 
-#: ../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:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Napaka omrežja"
 
-#: ../libempathy/empathy-utils.c:290
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Overitev ni uspela"
 
-#: ../libempathy/empathy-utils.c:292
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Napaka Å¡ifriranja"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Ime je v uporabi"
 
-#: ../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 "Potrdilo ni na voljo"
 
-#: ../libempathy/empathy-utils.c:298
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Potrdilo ni overjeno"
 
-#: ../libempathy/empathy-utils.c:300
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Potrdilo je preteklo"
 
-#: ../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 "Potrdilo ni potrjeno"
 
-#: ../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 "Neustrezno potrdilo gostitelja"
 
-#: ../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 "Neustrezen prstni odtis potrdila"
 
-#: ../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 "Potrdilo je samo-podpisano"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Napaka potrdila"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Å ifriranje ni na voljo."
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Potrdilo je neveljavno."
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Omrežna povezava je zavrnjena."
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Povezave ni mogo�e vzpostaviti."
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Povezava je prekinjena."
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:355
 msgid "This resource is already connected to the server"
 msgstr "Vir je s strežnikom že povezan"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Povezava je zamenjana z novo povezavo, ki uporablja isti vir."
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Ra�un na strežniku že obstaja"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Strežnik je trenutno preve� zaposlen za upravljanje s povezavo."
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Potrdilo je preklicano"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Potrdilo ne uporablja varnega algoritma ali pa uporablja Å¡ibko Å¡ifriranje."
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, ki je dolo�ena s šifrirno knjižnico."
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Programska oprema je prestara"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Notranja napaka"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Uporabniki v bližini"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook klepetanje"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -687,7 +687,7 @@ msgstr[1] "Pred %d sekundo"
 msgstr[2] "Pred %d sekundama"
 msgstr[3] "Pred %d sekundami"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -696,7 +696,7 @@ msgstr[1] "Pred %d minuto"
 msgstr[2] "Pred %d minutama"
 msgstr[3] "Pred %d minutami"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -705,7 +705,7 @@ msgstr[1] "Pred %d uro"
 msgstr[2] "Pred %d urama"
 msgstr[3] "Pred %d urami"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -714,7 +714,7 @@ msgstr[1] "Pred %d dnevom"
 msgstr[2] "Pred %d dnevoma"
 msgstr[3] "Pred %d dnevi"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -723,7 +723,7 @@ msgstr[1] "Pred %d tednom"
 msgstr[2] "Pred %d tednoma"
 msgstr[3] "Pred %d tedni"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -732,106 +732,78 @@ msgstr[1] "Pred %d mesecem"
 msgstr[2] "Pred %d mesecema"
 msgstr[3] "Pred %d meseci"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "v prihodnosti"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Vsi ra�uni"
 
-#: ../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 "Ra�un"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Geslo"
 
-#: ../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 "Strežnik"
 
-#: ../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 "Vrata"
 
-#: ../libempathy-gtk/empathy-account-widget.c:776
-#: ../libempathy-gtk/empathy-account-widget.c:828
+#: ../libempathy-gtk/empathy-account-widget.c:763
+#: ../libempathy-gtk/empathy-account-widget.c:815
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1182
-msgid "My Web Accounts"
-msgstr "Moji spletni ra�uni"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1199
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Ra�un %s se ureja preko %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1205
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Ra�una %s s programom Empathy ni mogo�e urejati."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Launch My Web Accounts"
-msgstr "Zaženi spletne ra�une"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1232
-#, c-format
-msgid "Edit %s"
-msgstr "Uredi %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1582
+#: ../libempathy-gtk/empathy-account-widget.c:1396
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1900
+#: ../libempathy-gtk/empathy-account-widget.c:1708
 msgid "A_pply"
 msgstr "_Uveljavi"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1930
+#: ../libempathy-gtk/empathy-account-widget.c:1737
 msgid "L_og in"
 msgstr "_Prijava"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:1810
 msgid "This account already exists on the server"
 msgstr "Ta ra�un na strežniku že obstaja"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2007
+#: ../libempathy-gtk/empathy-account-widget.c:1814
 msgid "Create a new account on the server"
 msgstr "Ustvari nov ra�un na strežniku"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2201
-msgid "Ca_ncel"
-msgstr "_Prekli�i"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2479
+#: ../libempathy-gtk/empathy-account-widget.c:2239
 #, 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:2505
+#: ../libempathy-gtk/empathy-account-widget.c:2265
 #, c-format
 msgid "%s Account"
 msgstr "%s ra�un"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2509
+#: ../libempathy-gtk/empathy-account-widget.c:2269
 msgid "New account"
 msgstr "Nov ra�un"
 
@@ -1304,188 +1276,194 @@ msgstr "Klic v sili ni podprt s tem protokolom"
 msgid "You don't have enough credit in order to place this call"
 msgstr "Na ra�unu ni dovolj visokega zneska za vzpostavitev klica"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:710
 msgid "Failed to open private chat"
 msgstr "Napaka med odpiranjem zasebnega klepeta"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:768
 msgid "Topic not supported on this conversation"
 msgstr "Tema ni podprta pri tem pogovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:774
 msgid "You are not allowed to change the topic"
 msgstr "Za spreminjanje teme nimate ustreznih dovoljenj."
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:973
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� ni veljaven ID stika"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: po�isti vsa sporo�ila trenutnega pogovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: dolo�i temo trenutnega pogovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID klepetalnice>: pridruži se novi klepetalnici"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<ID klepetalnice>] [<razlog>]: zapusti klepetalnico, privzeto je to trenutna klepetalnica"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID stika> [<sporo�ilo>]: odpre zasebni klepet"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID stika> <sporo�ilo>: odpre zasebni klepet"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <vzdevek>: spremeni vaš vzdevek na trenutnem strežniku"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <sporo�ilo>: pošlje sporo�ilo DEJANJA v trenutni pogovor"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <sporo�ilo>: pošlje <sporo�ilo> v trenutni pogovor. Možnost se uporablja za pošiljanje sporo�ila, ki se za�ne z '/'. Primer: \"/say /join se uporablja za pridruževanje novi klepetalnici\""
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID stika>: pokaže podrobnosti stika"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1105
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<ukaz>], pokaže vse podprte ukaze in njihov na�in uporabe."
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1124
 #, c-format
 msgid "Usage: %s"
 msgstr "Uporaba: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1169
 msgid "Unknown command"
 msgstr "Neznan ukaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1295
 msgid "Unknown command; see /help for the available commands"
 msgstr "Neznan ukaz, za ve� si vpišite /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1541
 msgid "insufficient balance to send message"
 msgstr "nezadostno stanje na ra�unu za pošiljanje sporo�il"
 
-#: ../libempathy-gtk/empathy-chat.c:1461
-#: ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../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 "Napaka med pošiljanjem sporo�ila '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463
-#: ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1547
+#: ../libempathy-gtk/empathy-chat.c:1564
+#: ../libempathy-gtk/empathy-chat.c:1626
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Napaka med pošiljanjem sporo�ila: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1553
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "Nezadostno stanje na ra�uni za pošiljanje sporo�ila. <a href='%s'>Povišaj</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1593
 msgid "not capable"
 msgstr "ni mogo�e"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1600
 msgid "offline"
 msgstr "brez povezave"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "invalid contact"
 msgstr "neveljaven stik"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "permission denied"
 msgstr "ni dovoljenja"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "too long message"
 msgstr "predolgo sporo�ilo"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "not implemented"
 msgstr "ni del programa"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "unknown"
 msgstr "neznano"
 
-#: ../libempathy-gtk/empathy-chat.c:1599
-#: ../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:1611
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema je dolo�ena na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1700
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s dolo�a vsebino: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1705
 msgid "No topic defined"
 msgstr "Ni dolo�ene teme"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2221
 msgid "(No Suggestions)"
 msgstr "(Ni predlogov)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2289
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Dodaj '%s' v slovar"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2326
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj '%s' v slovar %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2396
 msgid "Insert Smiley"
 msgstr "Vstavi smeška"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2414
 #: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Pošlji"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2376
+#: ../libempathy-gtk/empathy-chat.c:2471
 msgid "_Spelling Suggestions"
 msgstr "Predlogi �r_kovalnika"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2560
 msgid "Failed to retrieve recent logs"
 msgstr "Napaka med pridobivanjem nedavnih dnevnikov"
 
-#: ../libempathy-gtk/empathy-chat.c:2602
+#: ../libempathy-gtk/empathy-chat.c:2699
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s je prekinil povezavo"
@@ -1493,12 +1471,12 @@ msgstr "%s je prekinil povezavo"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2706
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s je izgnal %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2612
+#: ../libempathy-gtk/empathy-chat.c:2709
 #, c-format
 msgid "%s was kicked"
 msgstr "%s je bil izgnan"
@@ -1506,17 +1484,17 @@ msgstr "%s je bil izgnan"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2717
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s je izob�il %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2623
+#: ../libempathy-gtk/empathy-chat.c:2720
 #, c-format
 msgid "%s was banned"
 msgstr "%s je izob�en"
 
-#: ../libempathy-gtk/empathy-chat.c:2627
+#: ../libempathy-gtk/empathy-chat.c:2724
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je zapustil klepetalnico"
@@ -1526,17 +1504,17 @@ msgstr "%s je zapustil klepetalnico"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2636
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2661
+#: ../libempathy-gtk/empathy-chat.c:2758
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s je vstopil v klepetalnico"
 
-#: ../libempathy-gtk/empathy-chat.c:2686
+#: ../libempathy-gtk/empathy-chat.c:2783
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je preimenovan v %s"
@@ -1544,9 +1522,9 @@ msgstr "%s je preimenovan v %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2847
+#: ../libempathy-gtk/empathy-chat.c:2970
 #: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1260
+#: ../src/empathy-event-manager.c:1280
 #: ../src/empathy-call-window.c:1538
 #: ../src/empathy-call-window.c:1588
 #: ../src/empathy-call-window.c:2631
@@ -1554,73 +1532,73 @@ msgid "Disconnected"
 msgstr "Prekinjena povezava"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3493
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "Would you like to store this password?"
 msgstr "Ali želite shraniti geslo?"
 
-#: ../libempathy-gtk/empathy-chat.c:3499
+#: ../libempathy-gtk/empathy-chat.c:3640
 msgid "Remember"
 msgstr "Zapomni si"
 
-#: ../libempathy-gtk/empathy-chat.c:3509
+#: ../libempathy-gtk/empathy-chat.c:3650
 msgid "Not now"
 msgstr "Ne zdaj"
 
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3694
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Poskusi znova"
 
-#: ../libempathy-gtk/empathy-chat.c:3557
+#: ../libempathy-gtk/empathy-chat.c:3698
 msgid "Wrong password; please try again:"
 msgstr "Napa�no geslo; poskusite znova:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3687
+#: ../libempathy-gtk/empathy-chat.c:3828
 msgid "This room is protected by a password:"
 msgstr "Klepetalnica je zaš�itena z geslom:"
 
-#: ../libempathy-gtk/empathy-chat.c:3714
+#: ../libempathy-gtk/empathy-chat.c:3855
 msgid "Join"
 msgstr "Pridruži se"
 
-#: ../libempathy-gtk/empathy-chat.c:3902
-#: ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:4047
+#: ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Povezano"
 
-#: ../libempathy-gtk/empathy-chat.c:3957
+#: ../libempathy-gtk/empathy-chat.c:4102
 msgid "Conversation"
 msgstr "Pogovor"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3962
+#: ../libempathy-gtk/empathy-chat.c:4107
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Neznano ali neveljavno dolo�ilo"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokiranje stikov za�asno ni na voljo"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Blokiranje stika ni na voljo"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Dovoljenje je zavrnjeno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Stika ni mogo�e blokirati"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Uredi blokirane stike"
 
@@ -1628,7 +1606,7 @@ msgstr "Uredi blokirane stike"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1663,39 +1641,30 @@ msgstr "_Odpri povezavo"
 msgid "%A %B %d %Y"
 msgstr "%A, %d. %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Uredi podrobnosti stika"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:338
-msgid "Personal Information"
-msgstr "Osebni podatki"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:439
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Nov stik"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:508
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Ali želite blokirati %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:513
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Ali ste prepri�ani, da želite blokirati ponovno vzpostavitev stika med '%s' in vami?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:518
-#: ../libempathy-gtk/empathy-individual-dialogs.c:275
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:536
-#: ../libempathy-gtk/empathy-individual-dialogs.c:284
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Poro�aj te stike kot žaljive"
@@ -1715,73 +1684,6 @@ msgstr "Zahteva po naro�ilu"
 msgid "_Block User"
 msgstr "_Blokiraj_uporabnika"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../libempathy-gtk/empathy-individual-menu.c:1558
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Dodaj stik ..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:287
-msgid "_Block Contact"
-msgstr "_Blokiraj stik"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:316
-#: ../libempathy-gtk/empathy-individual-menu.c:789
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Klepet"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:348
-#: ../libempathy-gtk/empathy-individual-menu.c:881
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Zvo�ni klic"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:381
-#: ../libempathy-gtk/empathy-individual-menu.c:926
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Video klic"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:427
-#: ../libempathy-gtk/empathy-individual-menu.c:979
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "Predhodni po_govori"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:449
-#: ../libempathy-gtk/empathy-individual-menu.c:1020
-msgid "Send File"
-msgstr "Pošlji datoteko"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:472
-#: ../libempathy-gtk/empathy-individual-menu.c:1062
-msgid "Share My Desktop"
-msgstr "Souporaba namizja"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-#: ../libempathy-gtk/empathy-individual-menu.c:1125
-msgid "Infor_mation"
-msgstr "_Podrobnosti"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:601
-#: ../libempathy-gtk/empathy-individual-menu.c:1316
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Vabila v klepetalnico"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:632
-#: ../libempathy-gtk/empathy-individual-menu.c:1362
-msgid "_Invite to Chat Room"
-msgstr "_Povabi v klepetalnico"
-
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1807,133 +1709,133 @@ msgstr "Predstavitveno sporo�ilo:"
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Želel bi videti, kdaj ste na zvezi. Hvala!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:571
+#: ../libempathy-gtk/empathy-contact-widget.c:568
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanali:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-contact-widget.c:748
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ISO oznaka države:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-contact-widget.c:750
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Država:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-contact-widget.c:752
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Okraj:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-contact-widget.c:754
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Mesto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:756
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Podro�je:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-contact-widget.c:758
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Poštna številka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-contact-widget.c:760
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-contact-widget.c:762
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Stavba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-contact-widget.c:764
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Nadstropje:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-contact-widget.c:766
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Klepetalnica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-contact-widget.c:768
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Besedilo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-contact-widget.c:770
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-contact-widget.c:772
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:774
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Raven natan�nosti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:776
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Napaka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-contact-widget.c:778
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Napaka navpi�no (v metrih):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-contact-widget.c:780
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Napaka vodoravno (v metrih):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-contact-widget.c:782
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Hitrost:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-contact-widget.c:784
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Smer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-contact-widget.c:786
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Hitrost dviganja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:788
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Zadnji� posodobljeno:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-contact-widget.c:790
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Zemljepisna dolžina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-contact-widget.c:792
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Zemljepisna Å¡irina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:797
+#: ../libempathy-gtk/empathy-contact-widget.c:794
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Nadmorska višina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:847
+#: ../libempathy-gtk/empathy-contact-widget.c:862
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
 #: ../src/empathy-preferences.ui.h:15
@@ -1941,33 +1843,27 @@ msgid "Location"
 msgstr "Mesto"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:864
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:916
 #: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%B %Y ob %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-contact-widget.c:998
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Shrani podobo"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1057
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-contact-widget.c:1054
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Ni mogo�e shraniti podobe"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1745
-#: ../libempathy-gtk/empathy-individual-menu.c:1097
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
-msgid "Favorite"
-msgstr "Priljubljeno"
-
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Polno Ime"
@@ -2039,7 +1935,7 @@ msgstr "<b>Mesto</b> na (datum)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Vzdevek:"
 
@@ -2059,7 +1955,7 @@ msgstr "Podrobnosti stika"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Dolo�ilo:"
 
@@ -2076,29 +1972,29 @@ msgstr "OS:"
 msgid "Version:"
 msgstr "Razli�ica:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Skupine"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
 msgstr "Izbor skupin, ki jim stik pripada. Izbrati je mogo�e eno ali ve� skupin, lahko pa tudi nobene."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Dodaj skupino"
 
-#: ../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 "Izbor"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1952
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1919
 msgid "Group"
 msgstr "Skupina"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:258
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Naslednje identitete bodo blokirane:"
@@ -2106,7 +2002,7 @@ msgstr[1] "Naslednja identiteta bo blokirana:"
 msgstr[2] "Naslednji identiteti bosta blokirani:"
 msgstr[3] "Naslednje identitete bodo blokirane:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Naslednjih identitet ni mogo�e blokirati:"
@@ -2114,6 +2010,10 @@ msgstr[1] "Naslednje identitete ni mogo�e blokirati:"
 msgstr[2] "Naslednjih identitet ni mogo�e blokirati:"
 msgstr[3] "Naslednjih identitet ni mogo�e blokirati:"
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Uredi podrobnosti stika"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
@@ -2134,88 +2034,145 @@ msgstr "Stiki izbrani na seznamu na levi, bodo povezani skupaj."
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:148
+#: ../libempathy-gtk/empathy-individual-menu.c:181
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:363
 msgid "Select account to use to place the call"
 msgstr "Izbor ra�una za klicanje"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:316
+#: ../libempathy-gtk/empathy-individual-menu.c:367
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "Kli�i"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:381
+#: ../libempathy-gtk/empathy-individual-menu.c:432
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:383
+#: ../libempathy-gtk/empathy-individual-menu.c:434
 msgid "Work"
 msgstr "Delo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:385
+#: ../libempathy-gtk/empathy-individual-menu.c:436
 msgid "HOME"
 msgstr "Doma�a mapa"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:677
+msgid "_Block Contact"
+msgstr "_Blokiraj stik"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "_Klepet"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:836
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1174
+#: ../libempathy-gtk/empathy-individual-menu.c:1123
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Zvo�ni klic"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1156
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video klic"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "_Previous Conversations"
+msgstr "Predhodni po_govori"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
+msgid "Send File"
+msgstr "Pošlji datoteko"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1256
+msgid "Share My Desktop"
+msgstr "Souporaba namizja"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Priljubljeno"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1310
+msgid "Infor_mation"
+msgstr "_Podrobnosti"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1359
 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:1200
+#: ../libempathy-gtk/empathy-individual-menu.c:1385
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Poveži stike ..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2362
+#: ../libempathy-gtk/empathy-individual-menu.c:1501
+#: ../src/empathy-chat-window.c:1166
+msgid "Inviting you to this room"
+msgstr "Vabila v klepetalnico"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1547
+msgid "_Invite to Chat Room"
+msgstr "_Povabi v klepetalnico"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "_Dodaj stik ..."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2307
 msgid "Delete and _Block"
 msgstr "Izbriši in _blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2342
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ali zares želite odstraniti skupino '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2400
+#: ../libempathy-gtk/empathy-individual-view.c:2345
 msgid "Removing group"
 msgstr "Odstranjevanje skupine"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2455
-#: ../libempathy-gtk/empathy-individual-view.c:2672
+#: ../libempathy-gtk/empathy-individual-view.c:2400
+#: ../libempathy-gtk/empathy-individual-view.c:2617
 msgid "_Remove"
 msgstr "_Odstrani"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2532
+#: ../libempathy-gtk/empathy-individual-view.c:2477
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ali zares želite odstraniti stik '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2541
+#: ../libempathy-gtk/empathy-individual-view.c:2486
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "Ali res želite odstraniti povezan stik '%s'? S tem bo odstranjeni tudi vsi stiki, ki so opredeljeni kot povezani."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2553
+#: ../libempathy-gtk/empathy-individual-view.c:2498
 msgid "Removing contact"
 msgstr "Odstranjevanje stika"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2232,19 +2189,19 @@ msgstr "<b>Mesto</b> na (datum)"
 msgid "Online from a phone or mobile device"
 msgstr "Povezava je vzpostavljena preko telefona ali druge mobilne naprave"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Novo omrežje"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Izbor IRC omrežja"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Ponastavi seznam _omrežij"
 
-#: ../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 "Izbor"
@@ -2295,48 +2252,48 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Odstrani povezavo"
 
-#: ../libempathy-gtk/empathy-log-window.c:621
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Zgodovina"
 
-#: ../libempathy-gtk/empathy-log-window.c:676
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "Pokaži"
 
-#: ../libempathy-gtk/empathy-log-window.c:698
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "Poiš�i"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "Klepet v %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1149
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "Klepet s stikom %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1199
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../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, %d. %B %Y"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1288
+#: ../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:1294
+#: ../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:1370
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2345,7 +2302,7 @@ msgstr[1] "%s sekunda"
 msgstr[2] "%s sekundi"
 msgstr[3] "%s sekunde"
 
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2354,80 +2311,80 @@ msgstr[1] "%s minuta"
 msgstr[2] "%s minuti"
 msgstr[3] "%s minute"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Klic za�et %s, kon�an %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1719
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "Danes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1723
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "V�eraj"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1738
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%e. %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1826
-#: ../libempathy-gtk/empathy-log-window.c:3458
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "Kadarkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:1915
-#: ../libempathy-gtk/empathy-log-window.c:2371
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "Kdorkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:2684
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "Kdo"
 
-#: ../libempathy-gtk/empathy-log-window.c:2893
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "Kdaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "Karkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:3011
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "Besedilni klepet"
 
-#: ../libempathy-gtk/empathy-log-window.c:3013
+#: ../libempathy-gtk/empathy-log-window.c:3044
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3018
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "Dohodni klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "Odhodni klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3020
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "Prezrti klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "Kaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ali ste prepri�ani, da želite izbrisati vse podatke beležanja predhodnih pogovorov?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "Po�isti vse"
 
-#: ../libempathy-gtk/empathy-log-window.c:3762
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "Izbriši iz:"
 
@@ -2457,7 +2414,7 @@ msgstr "Video"
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "_Uredi"
 
@@ -2469,72 +2426,72 @@ msgstr "_Datoteka"
 msgid "page 2"
 msgstr "stran 2"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Stik ni povezan v omrežje"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
 msgstr "Izbrani stik ni veljaven ali pa ni znan"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "Stik ne podpira te vrste pogovora."
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Zahtevana zmožnost ni podprta s tem protokolom"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "S podanim stikom ni mogo�e za�eti pogovora"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "S tega kanala ste izob�eni"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "Kanal je polno zaseden."
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
 msgstr "Sodelovanje na kanalu je mogo�e le s povabilom."
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
 msgstr "Brez povezave ni mogo�e nadaljevati."
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
 msgstr "Dovoljenje je zavrnjeno"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
 msgstr "Prišlo je do napake med za�enjanjem pogovora"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
 msgid "Enter a contact identifier or phone number:"
 msgstr "Vnesite dolo�ilo stika ali pa telefonsko številko:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Nov pogovor"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "_Video Call"
 msgstr "_Video klic"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
 msgid "_Audio Call"
 msgstr "_Zvo�ni klic"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "Nov klic"
 
@@ -2659,12 +2616,12 @@ msgstr "Klic je kon�an"
 msgid "Edit Custom Messages"
 msgstr "Urejanje sporo�ila po meri"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Sporo�ilo je bilo nazadnje spremenjeno ob %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Obi�ajno"
 
@@ -2743,14 +2700,18 @@ msgid "Continue"
 msgstr "Nadaljuj"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Nepreverjena povezava"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Povezava ni varna. Ali želite vseeno nadaljevati?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Zapomni si izbor za prihodnje povezave"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Podrobnosti potrdila"
 
@@ -2943,31 +2904,31 @@ msgstr "zahodnoevropska"
 msgid "Vietnamese"
 msgstr "vietnamska"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Ni sporo�il o napakah"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Hipno sporo�anje (Empathy)"
 
-#: ../src/empathy.c:433
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "Brez samodejne povezave ob zagonu"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ne prikaži seznama stikov in drugih pogovornih oken ob zagonu"
 
-#: ../src/empathy.c:452
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "- Empathy sporo�ilnik"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "Napaka delovanja upravljalnika ra�unov"
 
-#: ../src/empathy.c:641
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2989,11 +2950,11 @@ msgstr "Empathy se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA J
 msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr "Skupaj s tem programom bi morali prejeti izvod Splošnega javnega dovoljenja GNU (GNU General Public License); v nasprotnem  primeru pišite na: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Odjemalec hipnega sporo�anja za namizje GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr "Matej Urban�i� <mateju@svn.gnome.org>"
 
@@ -3023,168 +2984,177 @@ msgid "You can either go back and try to enter your accounts' details again or q
 msgstr "Lahko ponovno vnesete podatke svojega ra�una ali pa kon�ate pomo�nika in dodate ra�une kasneje preko menija Uredi."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1272
+#: ../src/empathy-account-assistant.c:1274
 msgid "An error occurred"
 msgstr "Prišlo je do napake"
 
-#: ../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 "Kakšno vrsto klepetalnega ra�una 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 "Ali želite nastaviti še kakšen drug ra�un?"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "Vnesite podrobnosti svojega ra�una"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "Kakšne vrste klepetalni ra�un naj bo ustvarjen?"
 
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "Ali želite ustvariti druge klepetalne ra�une?"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "Vnesite podrobnosti novega ra�una"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
 msgstr "S programom Empathy lahko klepetate s posamezniki, ki uporabljajo Google Talk, AIM, Windows Live in mnogo drugih klepetalnih programov. S spletno kamero in mikrofonom lahko uporabljate tudi zvo�ne ali video klice."
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "Ali imate ra�un, ki ste ga uporabljali z drugim programom?"
 
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "Da, uvoziti želim podrobnosti ra�una iz"
 
-#: ../src/empathy-account-assistant.c:674
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "Da, takoj želim vnesti podrobnosti ra�una"
 
-#: ../src/empathy-account-assistant.c:696
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "Ne, ustvariti želim nov ra�un"
 
-#: ../src/empathy-account-assistant.c:706
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "Ne, želim le videti ljudi, povezane v bližini"
 
-#: ../src/empathy-account-assistant.c:727
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "Izbor ra�une za uvoz:"
 
-#: ../src/empathy-account-assistant.c:814
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../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:821
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "Ne, to je trenutno vse"
 
-#: ../src/empathy-account-assistant.c:1086
+#: ../src/empathy-account-assistant.c:1088
 msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
 msgstr "Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki istega omrežja. V primeru, da želite uporabljati to možnost, preverite spodnje podatke. Možnosti je mogo�e spreminjati tudi kasneje v pogovornemu oknu 'ra�uni'."
 
-#: ../src/empathy-account-assistant.c:1092
-#: ../src/empathy-account-assistant.c:1148
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1150
 msgid "Edit->Accounts"
 msgstr "Uredi->Ra�uni"
 
-#: ../src/empathy-account-assistant.c:1108
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
 msgstr "Te možnosti trenutno _ne želim omogo�iti"
 
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1146
 msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
 msgstr "Ni mogo�e klepetati z uporabniki, povezanimi v krajevnem omrežju, saj paket telepathy-salut ni nameš�en. V primeru, da želite to možnost omogo�iti, namestite zahtevani paket in ustvarite ra�un bližnjih uporabnikov med možnostmi ra�una."
 
-#: ../src/empathy-account-assistant.c:1150
+#: ../src/empathy-account-assistant.c:1152
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut ni nameš�en"
 
-#: ../src/empathy-account-assistant.c:1196
+#: ../src/empathy-account-assistant.c:1198
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Pomo�nik sporo�anja in ra�unov VoIP"
 
-#: ../src/empathy-account-assistant.c:1230
+#: ../src/empathy-account-assistant.c:1232
 msgid "Welcome to Empathy"
 msgstr "Dobrodošli v program Empathy"
 
-#: ../src/empathy-account-assistant.c:1239
+#: ../src/empathy-account-assistant.c:1241
 msgid "Import your existing accounts"
 msgstr "Uvozite svoje obstoje�e ra�une"
 
-#: ../src/empathy-account-assistant.c:1257
+#: ../src/empathy-account-assistant.c:1259
 msgid "Please enter personal details"
 msgstr "Vnesite osebne podatke"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:69
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Obstajajo neshranjene spremembe vašega %s ra�una."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
 msgstr "Novi ra�un še ni bil shranjen."
 
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
 #: ../src/empathy-streamed-media-window.c:757
 #: ../src/empathy-call-window.c:1325
 msgid "Connecting…"
 msgstr "Povezovanje ..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:385
 #, c-format
 msgid "Offline — %s"
 msgstr "Brez povezave - %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:397
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Prekinjena povezava - %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:408
 msgid "Offline — No Network Connection"
 msgstr "Brez povezave - ni omrežne povezave"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:415
 msgid "Unknown Status"
 msgstr "Neznano stanje"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:427
 msgid "Offline — Account Disabled"
 msgstr "Brez povezave - ra�un je onemogo�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 ""
-"Ustvarjen bo nov ra�un, trenutne spremembe pa bodo izgubljene!\n"
-"Ali ste prepri�ani, da želite nadaljevati?"
+#: ../src/empathy-accounts-dialog.c:530
+msgid "Edit Connection Parameters"
+msgstr "Uredi parametre povezave"
+
+#: ../src/empathy-accounts-dialog.c:693
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Pridobivanje osebnih podrobnosti s strežnika je spodletelo."
+
+#: ../src/empathy-accounts-dialog.c:699
+msgid "Go online to edit your personal information."
+msgstr "Prijava v omrežje za urejanje osebnih podrobnosti."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:784
+msgid "_Edit Connection Parameters..."
+msgstr "_Uredi parametre povezave ..."
+
+#: ../src/empathy-accounts-dialog.c:1289
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ali želite odstraniti %s iz ra�unalnika?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1293
 msgid "This will not remove your account on the server."
 msgstr "To ne bo odstranilo vašega ra�una s strežnika."
 
-#: ../src/empathy-accounts-dialog.c: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?"
@@ -3193,15 +3163,15 @@ msgstr ""
 "Ali ste prepri�ani, da želite nadaljevati?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1705
 msgid "_Enable"
 msgstr "_Omogo�i"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1706
 msgid "_Disable"
 msgstr "O_nemogo�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?"
@@ -3233,11 +3203,11 @@ msgstr "Za dodajanje novega ra�una morate najprej namestiti zaledje za vsak pro
 msgid "_Import…"
 msgstr "_Uvozi ..."
 
-#: ../src/empathy-auth-client.c:284
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- Empathy odjemalec overitve"
 
-#: ../src/empathy-auth-client.c:300
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy odjemalec overitve"
 
@@ -3512,18 +3482,18 @@ msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:26
 #: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_Vsebina"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_Razhroš�evanje"
 
 #: ../src/empathy-call-window.ui.h:29
 #: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "Pomo_�"
 
@@ -3536,13 +3506,48 @@ msgid "_Settings"
 msgstr "_Nastavitve"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../src/empathy-chat-window.c:481
-#: ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:285
+msgid "Close this window?"
+msgstr "Ali naj se okno zapre?"
+
+#: ../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 "Z zapiranjem tega okna se prekine tudi povezava s klepetalnico %s. Nadaljnja sporo�ila ne bodo prikazana do ponovne povezave."
+
+#: ../src/empathy-chat-window.c: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] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. Nadaljnja sporo�ila ne bodo prikazana do ponovne povezave."
+msgstr[1] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnico. Nadaljnja sporo�ila ne bodo prikazana do ponovne povezave."
+msgstr[2] "Z zapiranjem tega okna se prekine tudi povezava z %u klepetalnicama. Nadaljnja sporo�ila ne bodo prikazana do ponovne povezave."
+msgstr[3] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. Nadaljnja sporo�ila ne bodo prikazana do ponovne povezave."
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+msgid "Leave %s?"
+msgstr "Ali naj se prekine povezava s klepetalnico %s?"
+
+#: ../src/empathy-chat-window.c:311
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr "Nadaljnja sporo�ila s te klepetalnice ne bodo prikazana do ponovne povezave."
+
+#: ../src/empathy-chat-window.c:330
+msgid "Close window"
+msgstr "Zapri okno"
+
+#: ../src/empathy-chat-window.c:330
+msgid "Leave room"
+msgstr "Zapusti klepetalnico"
+
+#: ../src/empathy-chat-window.c:636
+#: ../src/empathy-chat-window.c:656
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3551,7 +3556,7 @@ msgstr[1] "%s (%d neprebrano)"
 msgstr[2] "%s (%d neprebrani)"
 msgstr[3] "%s (%d neprebrana)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3560,7 +3565,7 @@ msgstr[1] "%s (in %u drugo)"
 msgstr[2] "%s (in %u drugi)"
 msgstr[3] "%s (in %u druga)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3569,7 +3574,7 @@ msgstr[1] "%s (%d neprebrano od drugih)"
 msgstr[2] "%s (%d neprebrani od drugih)"
 msgstr[3] "%s (%d neprebrana od drugih)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3578,11 +3583,11 @@ msgstr[1] "%s (%d neprebrano od vseh)"
 msgstr[2] "%s (%d neprebrani od vseh)"
 msgstr[3] "%s (%d neprebrana od vseh)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c: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"
@@ -3591,7 +3596,7 @@ msgstr[1] "Pošiljanje %d sporo�ila"
 msgstr[2] "Pošiljanje %d sporo�il"
 msgstr[3] "Pošiljanje %d sporo�il"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
 msgstr "Pisanje sporo�ila."
 
@@ -3672,102 +3677,102 @@ msgstr "Samodejno povezovanje"
 msgid "Manage Favorite Rooms"
 msgstr "Upravljanje priljubljenih klepetalnic"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "Dohodni video klic"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 #: ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "Dohodni klic"
 
-#: ../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 kli�e preko video kanala. Ali se želite javiti?"
 
-#: ../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 kli�e. Ali se želite javiti?"
 
-#: ../src/empathy-event-manager.c:529
-#: ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../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 "Dohodni klic od %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "_Zavrni"
 
-#: ../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 "_Odgovori"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "_Odgovori z videom"
 
-#: ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../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 "Dohodni video klic od %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "Vabilo v klepetalnico"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Povabilo v %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 vabi, da se pridružite v %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "_Odkloni"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:860
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Pridruž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 je povabil v %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Povabljeni ste v %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Prihajajo� prenos datoteke od %s"
 
-#: ../src/empathy-event-manager.c:1145
-#: ../src/empathy-main-window.c:377
+#: ../src/empathy-event-manager.c:1147
+#: ../src/empathy-roster-window.c:371
 msgid "Password required"
 msgstr "Zahtevano geslo"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s želi dovoljenje za pogled dosegljivosti"
 
-#: ../src/empathy-event-manager.c:1214
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3777,108 +3782,108 @@ msgstr ""
 "Sporo�ilo: %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 "Neznano"
 
-#: ../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 "Prejemanje\"%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 "Pošiljanje \"%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 "Napaka med prejemanjem \"%s\" od %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Napaka med prejemanjem datoteke"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Napaka med pošiljanjem \"%s\" k %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Napaka med pošiljanjem 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\" prejeto 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\" poslano %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Prenos datoteke je kon�an"
 
-#: ../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 "Čakanje na odziv drugega udeleženca"
 
-#: ../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 "Preverjanje celovitosti \"%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 "Ustvarjanje razpršila \"%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"
 
@@ -3899,163 +3904,159 @@ msgid "Import Accounts"
 msgstr "Uvozi ra�une"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
 msgstr "Uvozi"
 
-#: ../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 "Vir"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-roster-window.c:388
 msgid "Provide Password"
 msgstr "Vpis gesla"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-roster-window.c:394
 msgid "Disconnect"
 msgstr "Prekini povezavo"
 
-#: ../src/empathy-main-window.c:637
+#: ../src/empathy-roster-window.c:626
 msgid "No match found"
 msgstr "Ni najdenih zadetkov."
 
-#: ../src/empathy-main-window.c:745
+#: ../src/empathy-roster-window.c:733
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "Ra�unov %s ni mogo�e uporabljati, dokler ni posodobljena programska oprema %s."
 
-#: ../src/empathy-main-window.c:813
+#: ../src/empathy-roster-window.c:799
 msgid "Update software..."
 msgstr "Posodobitev programske opreme ..."
 
-#: ../src/empathy-main-window.c:819
-#: ../src/empathy-main-window.c:940
+#: ../src/empathy-roster-window.c:805
+#: ../src/empathy-roster-window.c:922
 msgid "Close"
 msgstr "Zapri"
 
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-roster-window.c:910
 msgid "Reconnect"
 msgstr "Ponovno se poveži"
 
-#: ../src/empathy-main-window.c:934
+#: ../src/empathy-roster-window.c:916
 msgid "Edit Account"
 msgstr "Uredi ra�un"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1073
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1060
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Povišaj %s (%s) ..."
 
-#: ../src/empathy-main-window.c:1120
+#: ../src/empathy-roster-window.c:1106
 msgid "Top up account credit"
 msgstr "Povišaj znesek na ra�unu"
 
 #. top up button
-#: ../src/empathy-main-window.c:1191
+#: ../src/empathy-roster-window.c:1178
 msgid "Top Up..."
 msgstr "Povišaj ..."
 
-#: ../src/empathy-main-window.c:1934
+#: ../src/empathy-roster-window.c:1901
 msgid "Contact"
 msgstr "Stik"
 
-#: ../src/empathy-main-window.c:2309
+#: ../src/empathy-roster-window.c:2288
 msgid "Contact List"
 msgstr "Seznam stikov"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Stiki na _zemljevidu"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Stanje na ra�unu"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Najdi v _seznamu stikov"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Pridruži se _priljubljenim"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Uredi priljubljene"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "_Obi�ajna velikost"
 
-#: ../src/empathy-main-window-menubar.ui.h:7
+#: ../src/empathy-roster-window-menubar.ui.h:7
 #: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nov _klic ..."
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Obi�ajna velikost s _podobami"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Možnosti"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Pokaži _protokole"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Razvrsti po _imenu"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Razvrsti po _stanju"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Ra�uni"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokirani stiki"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Skr�en pogled"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Prenosi _datotek"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Pridruži se"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Nov pogovor ..."
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "Nepri_sotni stiki"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Osebni podatki"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "_Klepetalnica"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "Iskanje _stikov ..."
 
@@ -4069,7 +4070,7 @@ msgstr "ÄŒlani"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4082,16 +4083,16 @@ msgstr ""
 "Zahtevano geslo: %s\n"
 "ÄŒlani: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Seznama klepetalnic ni bilo mogo�e za�eti"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Seznama klepetalnic ni bilo mogo�e dokon�ati"
 
@@ -4132,7 +4133,7 @@ msgid "New conversation"
 msgstr "Nov pogovor"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Stik se je povezal"
 
 #: ../src/empathy-preferences.c:170
@@ -4152,46 +4153,46 @@ msgid "Language"
 msgstr "Jezik"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julija"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O, Romeo, Romeo, zakaj li Romeo?!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Odreci se rodu, odvrzi ime,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "�e ne, prisezi ve�no mi ljubezen,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "in dlje nisem Kapuletova."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Al' bi poslušal še, al govoril? "
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julija je prekinila povezavo."
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Možnosti"
 
@@ -4284,49 +4285,49 @@ msgid "Spell Checking"
 msgstr "Preverjanje �rkovanja"
 
 #: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "Za�ni klepet v:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "The list of languages reflects only the languages for which you have a dictionary installed."
 msgstr "Na seznamu jezikov so le tisti, za katere imate nameš�ene slovarje."
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "Teme"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr "Uporabi _podporo odpravljanja odmevov za izboljšanje kakovosti klica."
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Razli�ica:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Samodejno _poveži ob zagonu "
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobilni telefon"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Omogo�i obvestila v obla�kih"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Omogo�i zvo�na obvestila"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Omrežje (IP, Wifi)"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "N_ove klepete odpiraj v lo�enih oknih"
-
 #: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "O_bjavi mesto mojim stikom"
@@ -4336,6 +4337,14 @@ msgstr "O_bjavi mesto mojim stikom"
 msgid "_Reduce location accuracy"
 msgstr "_Zmanjšaj natan�nost mesta"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "nova _okna"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "novi _zavihki"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Stanje"
@@ -4392,7 +4401,7 @@ msgstr "Video je omogo�en"
 msgid "Video Preview"
 msgstr "Predogled videa"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Prikaz zemljevida stikov"
 
@@ -4457,16 +4466,16 @@ msgstr "Raven"
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Izbrani upravljalnik povezav ne podpira razširitve za oddaljeno razhroš�evanje."
 
-#: ../src/empathy-invite-participant-dialog.c:197
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Povabi udeležence"
 
-#: ../src/empathy-invite-participant-dialog.c:198
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izbor stika za povabilo v pogovor:"
 
-#: ../src/empathy-invite-participant-dialog.c:221
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Povabi"
 
@@ -4597,6 +4606,51 @@ msgstr "Povišaj"
 msgid "_Match case"
 msgstr "_Upoštevaj velikost �rk"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Dodajanje novega ra�una"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "N_ove klepete odpiraj v lo�enih oknih"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Vrsta vti�nice ni podprta"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Moji spletni ra�uni"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Ra�un %s se ureja preko %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Ra�una %s s programom Empathy ni mogo�e urejati."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Zaženi spletne ra�une"
+
+#~ msgid "Edit %s"
+#~ msgstr "Uredi %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_Prekli�i"
+
+#~ msgid "Personal Information"
+#~ msgstr "Osebni podatki"
+#~ msgctxt "Edit contact (contextual menu)"
+
+#~ msgid "_Edit"
+#~ msgstr "_Uredi"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Ustvarjen bo nov ra�un, trenutne spremembe pa bodo izgubljene!\n"
+#~ "Ali ste prepri�ani, da želite nadaljevati?"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Osebni podatki"
+
 #~ msgid "Call volume"
 #~ msgstr "Glasnost klica"
 
diff --git a/po/sr.po b/po/sr.po
index 693635676..4fe7081fe 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,5 +1,5 @@
 # Serbian translation of Empathy
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003-2009.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012.
 # This file is distributed under the same license as the Empathy package.
 # From Pidgin translation:
 # Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
@@ -11,524 +11,563 @@
 # 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-16 20:30+0000\n"
+"PO-Revision-Date: 2012-02-19 13:49+0200\n"
 "Last-Translator: Миро�лав �иколић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Ћа�кајте на Гугл разговору, Феј�буку, МС�-у и на многим другим �ерви�има за "
-"ћа�кање"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Интернет пи�моноша"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Програм за брзе поруке"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Допи�ивање преко Интернет пи�моноше"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Програм за брзе поруке"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Ћа�кајте на Гугл разговору, Феј�буку, МС�-у и на многим другим �ерви�има за "
+"ћа�кање"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "�алози за допи�ивање и VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Управљајте налозима за допи�ивање и ВоИП"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Увек отвара по�ебан прозор за нова ћа�кања."
+msgid "Connection managers should be used"
+msgstr "Да ли ће бити коришћен управник мрежом"
 
+# �ије connect већ disconnect!!! ~Милош
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Јачина звука позива"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Да ли треба кори�тити управника мреже за аутомат�ко прекидање и поновно "
+"у�по�тављање везе."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Јачина звука позива, у процентима."
+msgid "Empathy should auto-connect on startup"
+msgstr "Да ли Пи�моноша да �ам у�по�тавити везу по покретању"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Уређај камерице"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Да ли Пи�моноша да �е �ам пријави на по�тојеће налоге након покретања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Положај камерице"
+msgid "Empathy should auto-away when idle"
+msgstr "Да ли Пи�моноша да пређе у �тање аутомат�ког од�у�тва у мировању"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Знак за додавање по�ле надимка када �е кори�ти аутомат�ко довршавање надимка "
-"(таб) у групним ћа�кањима."
+"Да ли Пи�моноша да аутомат�ки пређе у �тање од�у�тва приликом мировања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Тема прозора за ћа�кање"
+msgid "Empathy default download folder"
+msgstr "Пи�моношина подразумевана фа�цикла за преузимања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Варијанта теме прозора за ћа�кање"
+msgid "The default folder to save file transfers in."
+msgstr "Подразумевана фа�цикла за чување прене�ених датотека."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-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 "Show contact groups"
+msgstr "Приказује групе контакта"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Омогућава Веб кит развојне алате"
+msgid "Whether to show groups in the contact list."
+msgstr "Да ли да приказује групе у �пи�ку контакта."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Омогућава и�качућа обавештења за нове поруке"
+msgid "Contact list sort criterion"
+msgstr "Критеријум за �ортирање пријатеља"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Омогућава проверу пи�ања"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Који критеријум �е кори�ти за �ортирање �пи�ка пријатеља. Подразумевано �е "
+"кори�ти „state“ (�ортирање по �тању пријатеља). �ко је вредно�т „name“, "
+"�ортирање �е врши по имену пријатеља."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Сакрива главни прозор"
+msgid "Use notification sounds"
+msgstr "Кори�ти звукове за обавештења"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Сакрива главни прозор програма."
+msgid "Whether to play a sound to notify of events."
+msgstr "Да ли да пу�ти обавештајни звук за догађаје."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Знак за довршавање надимка"
+msgid "Disable sounds when away"
+msgstr "Онемогућава звуке када �мо од�утни"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Отвара нова ћа�кања у различитим прозорима"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Да ли да пу�ти обавештајни звук када по�танете заузети или од�утни."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Путања до �дијум теме за коришћење"
+msgid "Play a sound for incoming messages"
+msgstr "Пушта звук за долазеће поруке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Путања до �дијум теме за коришћење, ако �е кори�ти �дијум тема за ћа�кање."
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Да ли да пу�ти обавештајни звук када вам �тигне порука."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "Пушта звук за долазеће поруке"
+msgid "Play a sound for outgoing messages"
+msgstr "Пушта звук за одлазеће поруке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Пушта звук за нове разговоре"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Да ли да пу�ти обавештајни звук када пошаљете поруку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
-msgstr "Пушта звук за одлазеће поруке"
+msgid "Play a sound for new conversations"
+msgstr "Пушта звук за нове разговоре"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Пушта звук када �е пријатељ пријави"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Да ли да пу�ти обавештајни звук на нови разговор."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Пушта звук када �е пријатељ одјави"
+msgid "Play a sound when a contact logs in"
+msgstr "Пушта звук када �е пријатељ пријави"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Пушта звук када �е ја пријавим"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Да ли да пу�ти обавештајни звук када �е пријатељи пријаве на мрежу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Пушта звук када �е ја одјавим"
+msgid "Play a sound when a contact logs out"
+msgstr "Пушта звук када �е пријатељ одјави"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "И�пи�ује обавештења ако ћа�кање није у фоку�у"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Да ли да пу�ти обавештајни звук када �е пријатељи одјаве �а мреже."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "И�пи�ује обавештења када �е пријатељ пријави"
+msgid "Play a sound when we log in"
+msgstr "Пушта звук када �е ја пријавим"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "И�пи�ује обавештења када �е пријатељ одјави"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Да ли да пу�ти звук када �е пријавите на мрежу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Положај приказа камерице за време позива."
+msgid "Play a sound when we log out"
+msgstr "Пушта звук када �е ја одјавим"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Приказује готовину на �пи�ку пријатеља"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Да ли да пу�ти звук када �е одјавите �а мреже."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Приказује �лике"
+msgid "Enable popup notifications for new messages"
+msgstr "Омогућава и�качућа обавештења за нове поруке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Приказује �пи�ак пријатеља у �обама"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Да ли да приказује облачић обавештења када примите нову поруку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Приказује �авет у вези затварања главног прозора"
+msgid "Disable popup notifications when away"
+msgstr "И�кључује и�качућа обавештења када �мо од�утни"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Приказује пријатеље ван мреже"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Да ли да приказује облачић обавештења када �те заузети или од�утни."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Приказује протоколе"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "И�пи�ује обавештења ако ћа�кање није у фоку�у"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Језици за проверу пи�ања"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Да ли да приказује облачић обавештења �а при�тиглим порукама чак и када је "
+"прозор за ћа�кање отворен, али није у фоку�у."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Подразумевана фа�цикла за чување прене�ених датотека."
+msgid "Pop up notifications when a contact logs in"
+msgstr "И�пи�ује обавештења када �е пријатељ пријави"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "По�ледња фа�цикла из које је изабрана �лика."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Да ли да приказује облачић обавештења када �е пријатељ пријави на мрежу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "Положај бочне површи прозора за ћа�кање"
+msgid "Pop up notifications when a contact logs out"
+msgstr "И�пи�ује обавештења када �е пријатељ одјави"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Сачуван положај (у тачкама) бочне површи прозора за ћа�кање."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Да ли да приказује облачић обавештења када �е пријатељ одјави �а мреже."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Тема за приказ разговора у прозору ћа�кања."
+msgid "Use graphical smileys"
+msgstr "Приказује �личицу �а �мешком"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Варијанта теме која �е кори�ти за приказ разговора у прозору ћа�кања."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Да ли да приказује �мешке као �личице унутар разговора."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
-msgstr "Приказује �личицу �а �мешком"
+msgid "Show contact list in rooms"
+msgstr "Приказује �пи�ак пријатеља у �обама"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Кори�ти звукове за обавештења"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Да ли да приказује �пи�ак пријатеља у �обама за ћа�кање."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Кори�ти теме за �обе ћа�кања"
+msgid "Chat window theme"
+msgstr "Тема прозора за ћа�кање"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Да ли Пи�моноша да објављује локацију кори�ника његовим пријатељима."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Тема за приказ разговора у прозору ћа�кања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Да ли Пи�моноша �ме да кори�ти ГПС да погоди локацију."
+msgid "Chat window theme variant"
+msgstr "Варијанта теме прозора за ћа�кање"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Да ли Пи�моноша �ме да кори�ти мобилну мрежу да погоди локацију."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Варијанта теме која �е кори�ти за приказ разговора у прозору ћа�кања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Да ли Пи�моноша �ме да кори�ти мрежу да погоди локацију."
+msgid "Path of the Adium theme to use"
+msgstr "Путања до �дијум теме за коришћење"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Да ли је Пи�моноша пребацио дневнике из лептира."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"Путања до �дијум теме за коришћење, ако �е кори�ти �дијум тема за ћа�кање."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Да ли Пи�моноша да �е �ам пријави на по�тојеће налоге након покретања."
+msgid "Enable WebKit Developer Tools"
+msgstr "Омогућава Веб кит развојне алате"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Да ли Пи�моноша да аутомат�ки пређе у �тање од�у�тва приликом мировања."
+"Да ли ће бити омогућени Веб кит развојни алати, као што је Веб Ин�пектор."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Да ли Пи�моноша да умањи прецизно�т локације због повећане приватно�ти."
+msgid "Inform other users when you are typing to them"
+msgstr "Обавештава о�тале кори�нике када им пишете поруку"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Да ли Пи�моноша да кори�ти �лику пријатеља као икону у прозору ћа�кања."
+"Да ли ће да пошаље �тања ћа�кања „�а�тавља“ или „паузиран“. �еће утицати на "
+"�тање „отишао“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Да ли ће бити омогућени Веб кит развојни алати, као што је Веб Ин�пектор."
+msgid "Use theme for chat rooms"
+msgstr "Кори�ти теме за �обе ћа�кања"
 
-# �ије connect већ disconnect!!! ~Милош
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Да ли треба кори�тити управника мреже за аутомат�ко прекидање и поновно "
-"у�по�тављање везе."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Да ли да кори�ти тему за �обе разговора."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Да ли да проверава пи�ање речи за изабране језике."
+msgid "Spell checking languages"
+msgstr "Језици за проверу пи�ања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Да ли да приказује �мешке као �личице унутар разговора."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Спи�ак језика одвојен зарезима које кори�ти провера правопи�а (нпр. „sr, en, "
+"fr“)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Да ли ће бити укључен филтер Пул�е аудиа за уклањање одјека."
+msgid "Enable spell checker"
+msgstr "Омогућава проверу пи�ања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Да ли да пу�ти обавештајни звук када �е пријатељи пријаве на мрежу."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Да ли да проверава пи�ање речи за изабране језике."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Да ли да пу�ти обавештајни звук када �е пријатељи одјаве �а мреже."
+msgid "Nick completed character"
+msgstr "Знак за довршавање надимка"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Да ли да пу�ти обавештајни звук за догађаје."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Знак за додавање по�ле надимка када �е кори�ти аутомат�ко довршавање надимка "
+"(таб) у групним ћа�кањима."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Да ли да пу�ти обавештајни звук када вам �тигне порука."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Да ли Пи�моноша да кори�ти �лику пријатеља као иконицу прозора за ћа�кање"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Да ли да пу�ти обавештајни звук на нови разговор."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Да ли Пи�моноша да кори�ти �лику пријатеља као икону у прозору ћа�кања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Да ли да пу�ти обавештајни звук када пошаљете поруку."
+msgid "Last account selected in Join Room dialog"
+msgstr "По�ледњи изабрани налог у прозорчету за придруживање �оби"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Да ли да пу�ти звук када �е пријавите на мрежу."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Путања објекта Д-ба�а по�ледњег налога изабраног за придруживање �оби"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Да ли да пу�ти звук када �е одјавите �а мреже."
+msgid "Camera device"
+msgstr "Уређај камерице"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Да ли да пу�ти обавештајни звук када по�танете заузети или од�утни."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"О�новна видео камерица која ће бити коришћена у видео позивима, нпр. „/dev/"
+"video0“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Да ли да приказује облачић обавештења када �е пријатељ одјави �а мреже."
+msgid "Camera position"
+msgstr "Положај камерице"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr ""
-"Да ли да приказује облачић обавештења када �е пријатељ пријави на мрежу."
+msgid "Position the camera preview should be during a call."
+msgstr "Положај приказа камерице за време позива."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Да ли да приказује облачић обавештења �а при�тиглим порукама чак и када је "
-"прозор за ћа�кање отворен, али није у фоку�у."
+msgid "Echo cancellation support"
+msgstr "Подршка за уклањање одјека"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Да ли да приказује облачић обавештења када примите нову поруку."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Да ли ће бити укључен филтер Пул�е аудиа за уклањање одјека."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Да ли да приказује изно� готовине налога у �пи�ку пријатеља."
+msgid "Show hint about closing the main window"
+msgstr "Приказује �авет у вези затварања главног прозора"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Да ли да приказује �лике за пријатеље у �пи�ку пријатеља и прозору ћа�кања."
+"Да ли да приказује поруку о затварању главног прозора када га затворите на "
+"„x“ дугме."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Да ли да приказује неповезане пријатеље у �пи�ку пријатеља."
+msgid "Empathy can publish the user's location"
+msgstr "Да ли Пи�моноша �ме да објављује локацију кори�ника"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Да ли да приказује облачић обавештења када �те заузети или од�утни."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Да ли Пи�моноша да објављује локацију кори�ника његовим пријатељима."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Да ли да приказује �лике за пријатеље у �пи�ку пријатеља и прозору ћа�кања."
+msgid "Empathy can use the network to guess the location"
+msgstr "Да ли Пи�моноша �ме да кори�ти мрежу да погоди локацију"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Да ли да приказује �пи�ак пријатеља у �обама за ћа�кање."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Да ли Пи�моноша �ме да кори�ти мрежу да погоди локацију."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Да ли да приказује �пи�ак пријатеља у збијеном режиму."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Да ли Пи�моноша �ме да кори�ти мобилну мрежу да погоди локацију"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Да ли да приказује поруку о затварању главног прозора када га затворите на "
-"„x“ дугме."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Да ли Пи�моноша �ме да кори�ти мобилну мрежу да погоди локацију."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Да ли да кори�ти тему за �обе разговора."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Да ли Пи�моноша �ме да кори�ти ГПС да погоди локацију"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Да ли Пи�моноша �ме да кори�ти ГПС да погоди локацију."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Да ли Пи�моноша да умањи прецизно�т локације"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Који критеријум �е кори�ти за �ортирање �пи�ка пријатеља. Подразумевано �е "
-"кори�ти „name“ (�ортирање по имену пријатеља). �ко је вредно�т „state“, "
-"�ортирање �е врши по �тању пријатеља."
+"Да ли Пи�моноша да умањи прецизно�т локације због повећане приватно�ти."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Управљајте налозима за допи�ивање и ВоИП"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "�ије наведен разлог"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "�алози за допи�ивање и VoIP"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Захтевана је промена �тања"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Обу�тавили �те прено� датотеке"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Друга �трана је прекинула прено� датотеке"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Грешка приликом прено�а датотеке"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Друга �трана није у могућно�ти да прене�е датотеку"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "�епознат разлог"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Прено� датотеке је завршен, али је датотека оштећена"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Друга �трана не подржава прено� датотека"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Изабрана датотека није обична датотека"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Изабрана датотека је празна"
 
@@ -548,169 +587,138 @@ msgstr "Позив кори�ника %s"
 msgid "Call from %s"
 msgstr "Позив од %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Вр�та прикључка није подржана"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "�ије наведен разлог"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Захтевана је промена �тања"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Обу�тавили �те прено� датотеке"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Друга �трана је прекинула прено� датотеке"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Грешка приликом прено�а датотеке"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Друга �трана није у могућно�ти да прене�е датотеку"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "�епознат разлог"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "До�тупан"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Заузет"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Од�утан"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "�евидљив"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "�еповезан"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�епознато"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "�ије наведен разлог"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Стање је по�тављено на „неповезан“"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/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 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 +726,31 @@ msgstr ""
 "Дужина �ертификата �ервера, или дубина ланца �ертификата �ервера премашује "
 "границе библиотеке за шифровање"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Ваш �офтвер је превише �тар"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Унутрашња грешка"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Људи у околини"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Јаху! Јапан"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Гугл разговор"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Феј�бук ћа�кање"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -744,7 +759,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 +768,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 +777,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 +786,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 +795,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 +804,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:336
 msgid "Account"
 msgstr "�алог"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Лозинка"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Сервер"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Моји веб налози"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "�алог %s је измењен путем %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "�алог %s не може бити уређиван из Пи�моноше."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Покрени Моје веб налоге"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Измени %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Кори�ничко име:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Примени"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Пријави _ме"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Овај налог већ по�тоји на �ерверу"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "�аправи нови налог на �ерверу"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "По_ништи"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s налог"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "�ови налог"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Пример:</b> Мој�адимак"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Лозинка:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "�апредно"
+msgid "Screen _Name:"
+msgstr "_�адимак:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Пример:</b> Мој�адимак"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Лозинка:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запамти лозинку"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запамти лозинку"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Порт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Запамти лозинку"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_�адимак:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Која је ваша �ИМ лозинка?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "�апредно"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Који је ваш �ИМ надимак?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "What is your AIM password?"
+msgstr "Која је ваша �ИМ лозинка?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Пример:</b> кори�ничко_име"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запамти лозинку"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_Кори�ничко име:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Пример:</b> кори�ничко_име"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Који је ваш Гроуп Вајз кори�нички ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Која је ваша Гроуп Вајз лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ИЦКу _КИБ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Пример:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Кодни р_а�поред:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ИЦКу _КИБ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Који је ваш ИЦКу КИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Која је ваша ИЦКу лозинка?"
 
@@ -1043,11 +1030,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 +1054,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 +1070,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 +1095,203 @@ msgstr ""
 "Уколико немате кори�ничко име за Феј�бук, идите на <a href=\"http://www."
 "facebook.com/username/\">ову �трану</a> да га изаберете."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Кори�ти �тари СС_Л"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Која је ваша Феј�бук лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Које је ваше Феј�бук кори�ничко име?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Који је ваш Гугл ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Пример:</b> korisnik@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Која је ваша Гугл лозинка?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Пример:</b> korisnik@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Занемари грешке ССЛ �ертификата"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_Приоритет:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Ре�ур�:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Захтева �е _шифровање(TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Кори�ти �тари СС_Л"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Превазиђи по�тавке �ервера"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Који је ваш �абер ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Која је ваша �абер лозинка?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Који је ваш жељени �абер ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Која је ваша �абер лозинка?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Која ја ваша жељена �абер лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Пример:</b> korisnik@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Који је ваш Виндоуз Уживо ИБ ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Која је ваша Виндоуз Уживо лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "�дре�а _е-поште:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_�адимак:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Презиме:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Име:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Име за _објаву:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_�абер ИД:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Презиме:"
+msgid "E-_mail address:"
+msgstr "�дре�а _е-поште:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Име за _објаву:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Кори�ничко име:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Пример:</b> korisnik@moj.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Кори�ничко име за пријаву:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Откриј повезивања"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "�утомат�ки откриј СТУ� �ервер"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Кори�ти овај налог за позиве _линиј�ких и мобилних телефона"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Занемари ТЛС грешке"
+msgid "NAT Traversal Options"
+msgstr "Опције прола�ка кроз ��Т"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Период (у �екундама)"
+msgid "Proxy Options"
+msgstr "Опције по�редника"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Опције за одржавање �талне везе"
+msgid "Miscellaneous Options"
+msgstr "Разне опције"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Слабо рутирање"
+msgid "STUN Server:"
+msgstr "СТУ� �ервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механизам:"
+msgid "Discover the STUN server automatically"
+msgstr "�утомат�ки откриј СТУ� �ервер"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Разне опције"
+msgid "Discover Binding"
+msgstr "Откриј повезивања"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Опције прола�ка кроз ��Т"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Опције за одржавање �талне везе"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механизам:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Опције по�редника"
+msgid "Interval (seconds)"
+msgstr "Период (у �екундама)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Кори�ничко име за пријаву:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Тран�порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "СТУ� �ервер:"
+msgid "Loose Routing"
+msgstr "Слабо рутирање"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Сервер:"
+msgid "Ignore TLS Errors"
+msgstr "Занемари ТЛС грешке"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Тран�порт:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Кори�ти овај налог за позиве _линиј�ких и мобилних телефона"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Која је лозинка за ваш СИП налог?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Која је идентификација за СИП пријаву?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Кори�ничко име:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Која је лозинка за ваш СИП налог?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Јаху! И_Б:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Занемари позивнице за причаонице и конференције"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Лок_ални �пи�ак �оба:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Који је ваш Јаху! ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Која је ваша Јаху! лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Јаху! И_Б:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Лок_ални �пи�ак �оба:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1343,7 +1330,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 +1350,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:728
 msgid "Failed to open private chat"
 msgstr "�и�ам у�пео да отворим приватно ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Теме ни�у подржане у овом разговору"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "�ије вам дозвољено да промените тему"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "„%s“ није и�праван ИБ контакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: чи�ти �ве поруке из овог разговора"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: по�тавља тему тренутног разговора"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ИБ �обе>: прикључује �е новој �оби за ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ИБ �обе>: прикључује �е новој �оби за ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<ИБ �обе>] [<разлог>]: напушта �обу за ћа�кање, подразумевано тренутну"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ИБ пријатеља> [<порука>]: отвара приватно ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ИБ пријатеља> <порука>: отвара приватно ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <надимак>: мења ваш надимак на тренутном �ерверу"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <порука>: шаље поруку Р�ДЊ� на тренутни разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1429,11 +1420,11 @@ msgstr ""
 "порука које почињу �а „/“. �а пример: „/say /join �е кори�ти за прикључивање "
 "у нову �обу за ћа�кање“"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ИБ контакта>: приказује податке о контакту"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1441,113 +1432,126 @@ msgstr ""
 "/help [<команда>]: приказује �ве подржане наредбе. �ко �е да и конкретна "
 "<наредба>, приказује њено упут�тво за употребу."
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Коришћење: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "�епозната наредба"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "�епозната наредба; погледајте /help за до�тупне наредбе"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "нема довољно готовине за �лање поруке"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Грешка при �лању поруке „%s“: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Грешка при �лању поруке: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "нема довољно готовине за �лање поруке. <a href='%s'>Допуните</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "не�по�обан"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "неповезан"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "неи�праван пријатељ"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "при�туп је забрањен"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "порука је предуга"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "није подржано"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1639
 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:1706 ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема је по�тављена на: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Тему је по�тавио %s на: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Тема није по�тављена"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(нема предлога)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Додај „%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:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Додај „%s“ у речник за %s језик"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Убаци �мешак"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Пошаљи"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "Предлози правопи_�а"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "�и�ам у�пео да преузмем �корашње дневнике"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s је отишао �а везе"
@@ -1555,12 +1559,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:2729
 #, 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:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s је избачен"
@@ -1568,17 +1572,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:2740
 #, 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:2743
 #, c-format
 msgid "%s was banned"
 msgstr "Кори�нику %s је забрањен при�туп"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s је напу�тио(ла) причаоницу"
@@ -1588,17 +1592,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:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s је при�тупио(ла) причаоници"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s је �ада познат као %s"
@@ -1606,90 +1610,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:2993
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Веза је прекинута"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Да ли желите да запамтите ову лозинку?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Запамти"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "�е �ада"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Покушај поново"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Погрешна лозинка, покушајте поново:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Ова �оба је заштићена лозинком:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Прикључи �е"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Повезан"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Разговор"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (СМС)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "�епознати или неи�праван идентификатор"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Блокирање пријатеља је тренутно недо�тупно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Блокирање пријатеља није до�тупно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "При�туп је забрањен"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "�е могу да блокирам пријатеља"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Измени блокиране пријатеље"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "�алог:"
 
@@ -1699,63 +1703,54 @@ msgstr "Блокирани пријатељи"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Уклони"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Умножи адре�у везе"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Отвори везу"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Измени податке контакта"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Подаци о профилу"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "�ови пријатељ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Блокирати %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Да ли �те �игурни да желите да блокирате да ва� „%s“ више не контактира?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Блокирај"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "П_ријави овај контакт за злоупотребу"
@@ -1764,401 +1759,315 @@ msgstr[2] "П_ријави ове контакте за злоупотребу"
 msgstr[3] "П_ријави овај контакт за злоупотребу"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Од_лучи ка�није"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Захтев за претплату"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Блокирај кори�ника"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "�егрупи�ано"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Омиљени људи"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Да ли �те �игурни да желите да уклоните групу „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Уклањам групу"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Уклони"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Да ли �те �игурни да желите да уклоните пријатеља „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Уклањам пријатеља"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "Дод_ај пријатеља…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Блокирај контакт"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "Ћа_�кање"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_�удио позив"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Видео позив"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Претходни разговори"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Пошаљи датотеку"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Подели моју радну површ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Омиљени"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Подаци"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "Изм_ени"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Позивам ва� у ову �обу"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "Позов_и у �обу за ћа�кање"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Од_лучи ка�није"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Претражи контакте"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Претрага:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "Дод_ај пријатеља"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "�ије пронађен ниједан пријатељ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Порука која ва� пред�тавља:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Молим ва� обаве�тите не када �те на мрежи. Хвала!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Изаберите пријатеља"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Пуно име:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Број телефона:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "�дре�а е-поште:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Веб �траница:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Рођендан:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Виђен пре:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Повезан �а:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Порука за од�утно�т:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Канали:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ИСО код државе:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Држава:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Република:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Град:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Обла�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Поштан�ки код:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Улица:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Зграда:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Спрат:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Соба:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Тек�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Опи�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "�дре�а:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "�иво тачно�ти:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "У�правна грешка (у метрима):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Водоравна грешка (у метрима):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Правац:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Брзина пењања:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "По�ледњи пут ажурирано:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Географ�ка дужина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Географ�ка ширина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Ви�ина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Локација"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%d.%Y у %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Сачувај �лику"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "�е могу да �ачувам �лику"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Локација</b> у (датум)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "�адимак:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Подаци о клијенту"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Програм:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Лични подаци"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Детаљи о пријатељу"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Име и презиме"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Број телефона"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "�дре�а ел. поште"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Веб �траница"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Рођендан"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Виђен пре:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Повезан �а:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Порука за од�утно�т:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "по�ао"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "кућа"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "мобилни"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "гла�овни"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "првен�твени"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "поштан�ки"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "пошиљка"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Идентификатор:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "�адимак:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Локација</b> у (датум)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Захтевани �у подаци…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Подаци о клијенту"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Издање:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Програм:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Групе"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2166,21 +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:1970
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Следећи идентитет ће бити блокиран:"
@@ -2188,7 +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,144 @@ msgstr[1] "Следећи идентитети не могу бити блоки
 msgstr[2] "Следећи идентитети не могу бити блокирани:"
 msgstr[3] "Следећи идентитет не може бити блокиран:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Повезани пријатељи"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Изаберите пријатеља за повезивање"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Преглед новог пријатеља"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Означени пријатељи на �пи�ку лево ће бити увезани заједно."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Измени податке контакта"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Изаберите налог који ће бити коришћен за позив"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c: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 "gnome-contacts not installed"
+msgstr "програм гномови контакти није ин�талиран"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Ин�талирајте „gnome-contacts“ да при�тупите подацима контаката."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Подаци"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Уреди"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Повежи контакте…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1175
+msgid "Inviting you to this room"
+msgstr "Позивам ва� у ову �обу"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Позов_и у �обу за ћа�кање"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "Дод_ај пријатеља…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Избриши и _блокирај"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Да ли �те �игурни да желите да уклоните групу „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Уклањам групу"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Уклони"
+
+#: ../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 +2251,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 +2268,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 +2297,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 +2347,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 +2356,197 @@ 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 contact is offline"
+msgstr "Контакт није на вези"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "�аведени контакт или је неи�праван или непознат"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Контакт не подржава ову вр�ту разговора"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Захтевана функционално�т није примењена за овај протокол"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "�е могу да започнем разговор �а датим контактом"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Избачени �те �а овог канала"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Овај канал је пун"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Морате бити позвани да �е придружите овом каналу"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "�е могу да на�тавим док је веза прекинута"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Забрањен при�туп"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Дошло је до грешке приликом започињања разговора"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c: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
+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
+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 "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 +2583,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 +2602,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 +2661,12 @@ msgstr "Позив за разговор је завршен"
 msgid "Edit Custom Messages"
 msgstr "Уреди произвољне поруке"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Порука је уређена %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "�ормално"
 
@@ -2766,34 +2743,38 @@ msgid "Certificate hostname: %s"
 msgstr "Име домаћина �ертификата: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "�а�тави"
+msgid "C_ontinue"
+msgstr "_�а�тави"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "�еповерљива веза"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ова веза није од поверења. Желите ли ипак да на�тавите?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запамти овај избор за наредне везе"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Детаљи �ертификата"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c: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 +2783,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 +2955,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 +3028,11 @@ msgstr ""
 "адре�у: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Гномов програм за брзе поруке"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Данило Шеган <dsegan@gmx.net>\n"
@@ -3071,222 +3044,73 @@ msgstr ""
 "\n"
 "Превод.орг — превод на �рп�ки језик."
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Грешка при увожењу налога."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Грешка при обради детаља налога."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Грешка при прављењу налога."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Догодила �е грешка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "И�пи�ана порука грешке: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Можете �е или вратити и пробати да поново уне�ете детаље налога или да "
-"затворите помоћника и додате налоге ка�није из менија „Измени“."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Дошло је до грешке"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Који тип налога за ћа�кање имате?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Да ли имате још неки налог за ћа�кање који желите да поде�ите?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Уне�ите детаље налога"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Који тип налога за ћа�кање желите да направите?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Да ли желите да направите још налога за ћа�кање?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Уне�ите детаље новог налога"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Са Интернет Пи�моношом можете ћа�кати и �а људима у близини и �а пријатељима "
-"и колегама који кори�те Гугл разговор, �ИМ, Виндоуз уживо и многе друге "
-"програме за ћа�кање. Са микрофоном и камером такође можете да обављате и "
-"аудио и видео позиве."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Да ли имате налог који �те кори�тили �а неким другим програмом за ћа�кање?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Да, увези детаље мог налога из "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Да, ја ћу �ам унети детаље налога"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "�е, желим нови налог"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "�е, за �ада �амо желим да видим људе у близини"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Изаберите налоге које желите да увезете:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Да"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "�е, то је �ве за �ада"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Пи�моноша може аутомат�ки да открије и ћа�ка �а људима који �у повезани на "
-"и�ту мрежу као и ви. �ко желите да кори�тите ову могућно�т, проверите да ли "
-"�у детаљи и�под тачни. Лако их можете изменити ка�није или и�кључити ову "
-"могућно�т из прозорчета „�алози“."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Измени->�алози"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "За �ада _не желим да кори�тим ову могућно�т"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"�е могу да ћа�кам �а људима повезаним на вашу локалну мрежу јер telepathy-"
-"salut није ин�талиран. �ко желите да омогућите ово, ин�талирајте пакет "
-"telepathy-salut и направите налог „Људи у околини“ из прозорчета „�алози“."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut није ин�талиран"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "��и�тент налога за брзе поруке и ВоИП"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Добродошли у Интернет Пи�моношу"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Увезите ваше по�тојеће налоге"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Уне�ите личне податке"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:71
 #, 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:75
 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:347
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Повезујем �е…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "�еповезан — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Веза је прекинута — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "�еповезан — �ема мрежне конекције"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "�епознато �тање"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:430
 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:533
+msgid "Edit Connection Parameters"
+msgstr "Уредите параметре повезивања"
+
+#: ../src/empathy-accounts-dialog.c:696
+msgid "Failed to retrieve your personal information from the server."
+msgstr "�и�ам у�пео да довучем ваше личне податке �а �ервера."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:702
+msgid "Go online to edit your personal information."
+msgstr "У�по�тавите везу да уредите ваше личне податке."
+
+#: ../src/empathy-accounts-dialog.c:787
+msgid "_Edit Connection Parameters..."
+msgstr "_Уреди параметре повезивања..."
+
+#: ../src/empathy-accounts-dialog.c:1283
 #, 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:1287
 msgid "This will not remove your account on the server."
 msgstr "Ово неће уклонити ваш налог на �ерверу."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3295,15 +3119,24 @@ msgstr ""
 "Да ли �игурно желите да на�тавите?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "_Омогући"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "О_немогући"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Пре�кочи"
+
+#: ../src/empathy-accounts-dialog.c:2087
+#| msgid "Connected"
+msgid "_Connect"
+msgstr "_Повежи �е"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3315,19 +3148,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Додај…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Учитавам податке о налогу"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "�иједан протокол није ин�талиран"
+msgid "_Import…"
+msgstr "_Увези…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Протокол:"
+msgid "Loading account information"
+msgstr "Учитавам податке о налогу"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3335,148 +3164,133 @@ msgstr ""
 "Да додате нови налог, прво морате да ин�талирате прикључке за �ве протоколе "
 "које желите да кори�тите."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Увези…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+#| msgid "No protocol installed"
+msgid "No protocol backends installed"
+msgstr "�и�у ин�талирани позадинци протокола"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " — Интернет пи�моноша клијент пријаве"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Интернет пи�моноша клијент пријаве"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Људи у околини"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
 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:228
 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:1934
 #, 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:2178
 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:2180
 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:2182
 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:2184
 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:2186
 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
+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:3040
 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:3079
 #, 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:3084
 #, 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:3090
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3485,27 +3299,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:3096
 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:3100
 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:3103
 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:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3516,161 +3330,216 @@ 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:3124
 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:3127
 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:3167
 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:3177
 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:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
+msgid "Unknown"
+msgstr "�епознато"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Кодек за декодирање:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "Ми_крофон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Удаљени кандидат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "По_дешавања"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Локални кандидат:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "Пре_глед"
+msgid "Audio"
+msgstr "�удио"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:285
+msgid "Close this window?"
+msgstr "Да затворим овај прозор?"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Затварањем овог прозора биће напуштено %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 "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 "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 +3548,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 +3557,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 +3566,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 +3575,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 +3588,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 +3664,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:1562
 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:1568
 #, 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:1568
 #, 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:374
 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 +3767,105 @@ msgstr ""
 "Порука: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�епознато"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s од %s при %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s од %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Примам „%s“ од %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Шаљем „%s“ за %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Грешка при примању „%s“ од %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Грешка при примању датотеке"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Грешка при �лању „%s“ за %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Грешка при �лању датотеке"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ је примљен од %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " „%s“ је по�лат за %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Прено� датотеке је завршен"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Чекам на одговор друге �тране"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Проверавам интегритет датотеке „%s“"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Тражим хеш датотеке „%s“"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Датотека"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Прео�тало"
 
@@ -4008,7 +3877,12 @@ msgstr "Прено�и датотека"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Уклони завршене, отказане и неу�пешне прено�е датотека �а �пи�ка"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+#| msgid "Import"
+msgid "_Import"
+msgstr "_Увези"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4016,171 +3890,198 @@ msgstr ""
 "�и�ам пронашао ниједан налог за увоз. Интернет пи�моноша тренутно подржава "
 "�амо увожење налога из Пиџина."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Увезите налоге"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Увези"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Извор"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Уне�ите лозинку"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Веза је прекинута"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Морате да поде�ите налог да би�те овде видели контакте."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "�ема поклапања"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Извините, %s налози не могу бити коришћени �ве док не ажурирате ваш %s "
+"�офтвер."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "�журирај �офтвер..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Затвори"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Поново �е повежи"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Измени налог"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Затвори"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Допуни %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Допуните кредит налога"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Допуни..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Пријатељ"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"Морате да укључите један од ваших налога да би�те овде видели контакте."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Морате да укључите %s да би�те овде видели контакте."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Спи�ак пријатеља"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Пријатељи на _мапи"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Подешавања налога"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Изно� готовине"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_�ови разговор…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Пронађи у _�пи�ку пријатеља"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "�ови _позив…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Придружи �е _омиљеним"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Тражи пријатеље…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Уреди омиљене"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Прено�и _датотека"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "�_ормална величина"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "�еп_овезани пријатељи"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "�ови _позив…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Прикажи _протоколе"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "�ормална величина �а _аватарима"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Изно� готовине"
+
+#: ../src/empathy-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 +4094,27 @@ msgstr ""
 "Потребна лозинка: %s\n"
 "Чланови: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Да"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�е"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "�е могу да покренем ли�тање �пи�ка �оба"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "�е могу да зау�тавим ли�тање �пи�ка �оба"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "�е могу да учитам �пи�ак �оба"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Придружи �е �оби"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4217,6 +4123,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 +4134,313 @@ msgstr ""
 "Уне�ите �ервер који угошћава �обе, или о�тавите празно ако �у �обе на "
 "�ерверу на којем вам је налог"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Придружи �е �оби"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "�е могу да учитам �пи�ак �оба"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Спи�ак �оба"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Соба:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Порука је примљена"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Порука је по�лата"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "�ови разговор"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Пријатељ �е пријавио"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Пријатељ �е одјавио"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "�алог је на вези"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "�алог није на вези"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Језик"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Паја"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Јаре"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Јао, куме, готов �ам!! Ја �ам бивши човек!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Пајо, шта је било, Пајооо??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Како шта је било?? �ема је више, украли �у ми је!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Шта �у ти украли, Пајо?? Штаааа??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Како шта?? �ма лађу, украли �у ми лађу!! Јао мени!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Сав очајан, Паја је прекинуо везу."
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "По�тавке"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Прикажи �лике _�мешака"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Прикажи �пи�ак _пријатеља у �обама"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Изглед"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Понашање"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Започни ћа�кања у:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Тема ћа�кања:"
+msgid "new ta_bs"
+msgstr "новим _језичцима"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "И�кључи обавештења када �ам _од�утан или заузет"
+msgid "new _windows"
+msgstr "новим _прозорима"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "И�кључи звуке када �ам _од�утан или заузет"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Прикажи долазне догађаје у обавештајној зони"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Сам �е повежи након покретања"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Уклањање одјека чини да ваш гла� другој о�оби звучи ја�није, али може да "
-"изазове проблеме на неким рачунарима. �ко ви или ваш �аговорник чујете чудне "
-"шумове или крчање за време позива, покушајте да и�кључите уклањање одјека и "
-"поново покрените позив."
+msgid "Log conversations"
+msgstr "Забележи разговоре"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Омогући обавештења када пријатељ дође на мрежу"
+msgid "Behavior"
+msgstr "Понашање"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Омогући обавештења када пријатељ оде �а мреже"
+msgid "General"
+msgstr "Опште"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Омогући обавештења када _ћа�кања ни�у у фоку�у"
+msgid "_Enable bubble notifications"
+msgstr "_Омогући обавештења у облачићима"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Омогући проверу правопи�а за �ледеће језике:"
+msgid "Disable notifications when _away or busy"
+msgstr "И�кључи обавештења када �ам _од�утан или заузет"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Опште"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Омогући обавештења када _ћа�кања ни�у у фоку�у"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Улазни ниво:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Омогући обавештења када пријатељ дође на мрежу"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Јачина улазног звука:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Омогући обавештења када пријатељ оде �а мреже"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Обавештења"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Извори локација:"
+msgid "_Enable sound notifications"
+msgstr "Омогући _звучна обавештења"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Забележи разговоре"
+msgid "Disable sounds when _away or busy"
+msgstr "И�кључи звуке када �ам _од�утан или заузет"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Обавештења"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Пу�ти звук за догађаје"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Звуци"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Приватно�т"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Кори�ти уклањање _одјека да побољшаш квалитет позива"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Умањена тачно�т локације значи да ће најтачнији објављени подаци о вашој "
-"локацији бити град и држава.  ГПС координате ће бити тачне до 1. децимале."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Прикажи �лике _�мешака"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Прикажи �пи�ак _пријатеља у �обама"
+"Уклањање одјека чини да ваш гла� другој о�оби звучи ја�није, али може да "
+"изазове проблеме на неким рачунарима. �ко ви или ваш �аговорник чујете чудне "
+"шумове или крчање за време позива, покушајте да и�кључите уклањање одјека и "
+"поново покрените позив."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Звуци"
+msgid "_Publish location to my contacts"
+msgstr "Објави локацију мојим _пријатељима"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Провера пи�ања"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"Овај �пи�ак језика пред�тавља �амо оне језике за које имате ин�талиране "
-"речнике."
+"Умањена тачно�т локације значи да ће најтачнији објављени подаци о вашој "
+"локацији бити град и држава.  ГПС координате ће бити тачне до 1. децимале."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Теме"
+msgid "_Reduce location accuracy"
+msgstr "Умањи _тачно�т локације"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Варијанта:"
+msgid "Privacy"
+msgstr "Приватно�т"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "_Сам �е повежи након покретања"
+msgid "_GPS"
+msgstr "_ГПС"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Мобилни телефон"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "_Омогући обавештења у облачићима"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Мрежа (ИП, бежична)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "Омогући _звучна обавештења"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_ГПС"
+msgid "Location sources:"
+msgstr "Извори локација:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Мрежа (ИП, бежична)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Овај �пи�ак језика пред�тавља �амо оне језике за које имате ин�талиране "
+"речнике."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Отварај ћа�кања у новим прозорима"
+msgid "Enable spell checking for languages:"
+msgstr "Омогући проверу правопи�а за �ледеће језике:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "Објави локацију мојим _пријатељима"
+msgid "Spell Checking"
+msgstr "Провера пи�ања"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "_Тема ћа�кања:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "Умањи _тачно�т локације"
+msgid "Variant:"
+msgstr "Варијанта:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Теме"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Стање"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Позови пријатеља поново"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "И�кљ. камеру"
+msgid "Redial"
+msgstr "Поново зови"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Укљ. камеру"
+msgid "V_ideo"
+msgstr "В_идео"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "И�кљ. видео"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Онемогући камеру и пре�тани да шаљеш видео"
+msgid "Video Preview"
+msgstr "Преглед видеа"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Омогући камеру и шаљи видео"
+msgid "Video On"
+msgstr "Укљ. видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Омогући камеру, али не шаљи видео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Позови пријатеља поново"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Преглед"
+msgid "Camera Off"
+msgstr "И�кљ. камеру"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Поново зови"
+msgid "Disable camera and stop sending video"
+msgstr "Онемогући камеру и пре�тани да шаљеш видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "В_идео"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Преглед"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "И�кљ. видео"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Омогући камеру, али не шаљи видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Укљ. видео"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Укљ. камеру"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Преглед видеа"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Омогући камеру и шаљи видео"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Мапа пријатеља"
 
@@ -4597,96 +4507,96 @@ 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 "Позови"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "�е приказуј ниједно прозорче; уради по�ао који имаш (нпр. увожење) и изађи"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "�е приказуј ниједно прозорче о�им ако не по�тоје �амо налози „Људи у близини“"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Почетно изабирање датог налога (нпр. gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<идентификација налога>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— �алози Пи�моноше"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "�алози Пи�моноше"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Прикажи по�ебну у�лугу"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "— Отклањање грешака Пи�моноше"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Отклањање грешака Пи�моноше"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "— Пи�моноша програм за ћа�кање"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c: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:1572
 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:1573
 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 +4607,340 @@ 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:1179 ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "и"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "�а чекању"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Утишај"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Трајање"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3214
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Ваше тренутно �тање је %s."
+
+#: ../src/empathy-call-window.c:3218
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Извините, али немате довољно кредита за овај позив."
+
+#: ../src/empathy-call-window.c:3220
+msgid "Top Up"
+msgstr "Допуни"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Упореди величину �лова"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Који тип налога за ћа�кање имате?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Додајем нови налог"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Људи у околини"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+#| msgid ""
+#| "Empathy can automatically discover and chat with the people connected on "
+#| "the same network as you. If you want to use this feature, please check "
+#| "that the details below are correct. You can easily change these details "
+#| "later or disable this feature by using the 'Accounts' dialog"
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Пи�моноша може аутомат�ки да открије и ћа�ка �а људима који �у повезани на "
+"и�ту мрежу као и ви. �ко желите да кори�тите ову могућно�т, проверите да ли "
+"�у детаљи и�под тачни."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Можете ка�није да измените те детаље или да и�кључите ову могућно�т тако што "
+"ћете изабрати <span style=\"italic\">Уреди → �алози</span> �а �пи�ка "
+"контаката."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Грешка при увожењу налога."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Грешка при обради детаља налога."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Грешка при прављењу налога."
+
+#~ msgid "There was an error."
+#~ msgstr "Догодила �е грешка."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "И�пи�ана порука грешке: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Можете �е или вратити и пробати да поново уне�ете детаље налога или да "
+#~ "затворите помоћника и додате налоге ка�није из менија „Измени“."
+
+#~ msgid "An error occurred"
+#~ msgstr "Дошло је до грешке"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Да ли имате још неки налог за ћа�кање који желите да поде�ите?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Уне�ите детаље налога"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Који тип налога за ћа�кање желите да направите?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Да ли желите да направите још налога за ћа�кање?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Уне�ите детаље новог налога"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Са Интернет Пи�моношом можете ћа�кати и �а људима у близини и �а "
+#~ "пријатељима и колегама који кори�те Гугл разговор, �ИМ, Виндоуз уживо и "
+#~ "многе друге програме за ћа�кање. Са микрофоном и камером такође можете да "
+#~ "обављате и аудио и видео позиве."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "Да ли имате налог који �те кори�тили �а неким другим програмом за ћа�кање?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Да, увези детаље мог налога из "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Да, ја ћу �ам унети детаље налога"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "�е, желим нови налог"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "�е, за �ада �амо желим да видим људе у близини"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Изаберите налоге које желите да увезете:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "�е, то је �ве за �ада"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Измени->�алози"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "За �ада _не желим да кори�тим ову могућно�т"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "�е могу да ћа�кам �а људима повезаним на вашу локалну мрежу јер telepathy-"
+#~ "salut није ин�талиран. �ко желите да омогућите ово, ин�талирајте пакет "
+#~ "telepathy-salut и направите налог „Људи у околини“ из прозорчета „�алози“."
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut није ин�талиран"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "��и�тент налога за брзе поруке и ВоИП"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Добродошли у Интернет Пи�моношу"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Увезите ваше по�тојеће налоге"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Уне�ите личне податке"
+
+#~ msgid "Protocol:"
+#~ msgstr "Протокол:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Приказује помоћника налога"
+
+#~ msgid "Call volume"
+#~ msgstr "Јачина звука позива"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Јачина звука позива, у процентима."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Пи�моноша је пребацио дневнике из лептира"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Да ли је Пи�моноша пребацио дневнике из лептира."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Вр�та прикључка није подржана"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Моји веб налози"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "�алог %s је измењен путем %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "�алог %s не може бити уређиван из Пи�моноше."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Покрени Моје веб налоге"
+
+#~ msgid "Edit %s"
+#~ msgstr "Измени %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "По_ништи"
+
+#~ msgid "Personal Information"
+#~ msgstr "Подаци о профилу"
+
+#~ msgid "Ungrouped"
+#~ msgstr "�егрупи�ано"
+
+#~ msgid "Favorite People"
+#~ msgstr "Омиљени људи"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "Изм_ени"
+
+#~ msgid "Select a contact"
+#~ msgstr "Изаберите пријатеља"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Повезани пријатељи"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Изаберите пријатеља за повезивање"
+
+#~ msgid "New contact preview"
+#~ msgstr "Преглед новог пријатеља"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Означени пријатељи на �пи�ку лево ће бити увезани заједно."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Повежи контакте…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Повежи пријатеље"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Развежи…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Раздваја увезане контакте у по�ебне пријатеље."
+
+#~ msgid "_Link"
+#~ msgstr "_Увежи"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Да развежем увезаног пријатеља „%s“?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Да ли �те �игурни да желите да развежете увезаног пријатеља? Овим ћете "
+#~ "раздвојити увезане контакте у по�ебне пријатеље."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Развежи"
+
+#~ msgid "Contact ID:"
+#~ msgstr "ИБ пријатеља:"
+
+#~ msgid "C_hat"
+#~ msgstr "Ћ_а�кај"
+
+#~ msgid "Send _Video"
+#~ msgstr "Пошаљи _видео"
+
+#~ msgid "C_all"
+#~ msgstr "_Позови"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "По�тавите ваше при�у�тво и тренутно �тање"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Изабрани пријатељ не може да прими датотеке."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Изабрани пријатељ није на вези."
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Овим ћете направити нови налог, занемаривши унете измене.\n"
+#~ "Да ли �игурно желите да на�тавите?"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "�епознато"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "�епознато"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "�епознато"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "�епознато"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Лични _подаци"
+
+#~ msgid "Input level:"
+#~ msgstr "Улазни ниво:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Јачина улазног звука:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Отварај ћа�кања у новим прозорима"
+
 #~ msgid "All"
 #~ msgstr "Све"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 4c3713bbf..5426af185 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,5 +1,5 @@
 # Serbian translation of Empathy
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003-2009.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012.
 # This file is distributed under the same license as the Empathy package.
 # From Pidgin translation:
 # Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
@@ -11,524 +11,563 @@
 # 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-16 20:30+0000\n"
+"PO-Revision-Date: 2012-02-19 13:49+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Ćaskajte na Gugl razgovoru, Fejsbuku, MSN-u i na mnogim drugim servisima za "
-"ćaskanje"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Internet pismonoša"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Program za brze poruke"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Dopisivanje preko Internet pismonoše"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Program za brze poruke"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Ćaskajte na Gugl razgovoru, Fejsbuku, MSN-u i na mnogim drugim servisima za "
+"ćaskanje"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "Nalozi za dopisivanje i VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Upravljajte nalozima za dopisivanje i VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Uvek otvara poseban prozor za nova ćaskanja."
+msgid "Connection managers should be used"
+msgstr "Da li će biti korišćen upravnik mrežom"
 
+# Nije connect već disconnect!!! ~Miloš
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Ja�ina zvuka poziva"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Da li treba koristiti upravnika mreže za automatsko prekidanje i ponovno "
+"uspostavljanje veze."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Ja�ina zvuka poziva, u procentima."
+msgid "Empathy should auto-connect on startup"
+msgstr "Da li Pismonoša da sam uspostaviti vezu po pokretanju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Uređaj kamerice"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Da li Pismonoša da se sam prijavi na postojeće naloge nakon pokretanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Položaj kamerice"
+msgid "Empathy should auto-away when idle"
+msgstr "Da li Pismonoša da pređe u stanje automatskog odsustva u mirovanju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Znak za dodavanje posle nadimka kada se koristi automatsko dovršavanje nadimka "
-"(tab) u grupnim ćaskanjima."
+"Da li Pismonoša da automatski pređe u stanje odsustva prilikom mirovanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Tema prozora za ćaskanje"
+msgid "Empathy default download folder"
+msgstr "Pismonošina podrazumevana fascikla za preuzimanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Varijanta teme prozora za ćaskanje"
+msgid "The default folder to save file transfers in."
+msgstr "Podrazumevana fascikla za �uvanje prenesenih datoteka."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-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 "Show contact groups"
+msgstr "Prikazuje grupe kontakta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Omogućava Veb kit razvojne alate"
+msgid "Whether to show groups in the contact list."
+msgstr "Da li da prikazuje grupe u spisku kontakta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Omogućava iska�uća obaveštenja za nove poruke"
+msgid "Contact list sort criterion"
+msgstr "Kriterijum za sortiranje prijatelja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Omogućava proveru pisanja"
+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:33
-msgid "Hide main window"
-msgstr "Sakriva glavni prozor"
+msgid "Use notification sounds"
+msgstr "Koristi zvukove za obaveštenja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Sakriva glavni prozor programa."
+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:35
-msgid "Nick completed character"
-msgstr "Znak za dovršavanje nadimka"
+msgid "Disable sounds when away"
+msgstr "Onemogućava zvuke kada smo odsutni"
 
 #: ../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 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:37
-msgid "Path of the Adium theme to use"
-msgstr "Putanja do Adijum teme za korišćenje"
+msgid "Play a sound for incoming messages"
+msgstr "Pušta zvuk za dolazeć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 incoming messages."
+msgstr "Da li da pusti obaveštajni zvuk kada vam stigne poruka."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "Pušta zvuk za dolazeće poruke"
+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 "Play a sound for new conversations"
-msgstr "Pušta zvuk za nove razgovore"
+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:41
-msgid "Play a sound for outgoing messages"
-msgstr "Pušta zvuk za odlazeće poruke"
+msgid "Play a sound for new conversations"
+msgstr "Pušta zvuk za nove razgovore"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Pušta zvuk kada se prijatelj prijavi"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Da li da pusti obaveštajni zvuk na novi razgovor."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Pušta zvuk kada se prijatelj odjavi"
+msgid "Play a sound when a contact logs in"
+msgstr "Pušta zvuk kada se prijatelj prijavi"
 
 #: ../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 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:45
-msgid "Play a sound when we log out"
-msgstr "Pušta zvuk kada se ja odjavim"
+msgid "Play a sound when a contact logs out"
+msgstr "Pušta zvuk kada se prijatelj odjavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Ispisuje obaveštenja ako ćaskanje nije u fokusu"
+msgid ""
+"Whether to play a sound to notify of contacts logging 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: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 in"
+msgstr "Pušta zvuk kada se ja prijavim"
 
 #: ../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 into a network."
+msgstr "Da li da pusti zvuk kada se prijavite na mrežu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Položaj prikaza kamerice za vreme poziva."
+msgid "Play a sound when we log out"
+msgstr "Pušta zvuk kada se ja odjavim"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Prikazuje gotovinu na spisku prijatelja"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Da li da pusti zvuk kada se odjavite sa mreže."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Prikazuje slike"
+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:52
-msgid "Show contact list in rooms"
-msgstr "Prikazuje spisak prijatelja u sobama"
+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:53
-msgid "Show hint about closing the main window"
-msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora"
+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:54
-msgid "Show offline contacts"
-msgstr "Prikazuje prijatelje van mreže"
+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:55
-msgid "Show protocols"
-msgstr "Prikazuje protokole"
+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:56
-msgid "Spell checking languages"
-msgstr "Jezici za proveru pisanja"
+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: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 in"
+msgstr "Ispisuje obaveštenja kada se prijatelj prijavi"
 
 #: ../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 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:59
-msgid "The position for the chat window side pane"
-msgstr "Položaj bo�ne površi prozora za ćaskanje"
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ispisuje obaveštenja kada se prijatelj odjavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Sa�uvan položaj (u ta�kama) bo�ne površi prozora za ćaskanje."
+msgid "Whether to show a popup notification when a contact goes 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:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Tema za prikaz razgovora u prozoru ćaskanja."
+msgid "Use graphical smileys"
+msgstr "Prikazuje sli�icu sa smeškom"
 
 #: ../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 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:63
-msgid "Use graphical smileys"
-msgstr "Prikazuje sli�icu sa smeškom"
+msgid "Show contact list in rooms"
+msgstr "Prikazuje spisak prijatelja u sobama"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Koristi zvukove za obaveštenja"
+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:65
-msgid "Use theme for chat rooms"
-msgstr "Koristi teme za sobe ćaskanja"
+msgid "Chat window theme"
+msgstr "Tema 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 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:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju."
+msgid "Chat window theme variant"
+msgstr "Varijanta teme prozora za ćaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju."
+msgid ""
+"The theme 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: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 "Path of the Adium theme to use"
+msgstr "Putanja do Adijum teme za korišćenje"
 
 #: ../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 "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: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 "Enable WebKit Developer Tools"
+msgstr "Omogućava Veb kit razvojne alate"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Da li Pismonoša da automatski pređe u stanje odsustva prilikom mirovanja."
+"Da li će biti omogućeni Veb kit razvojni alati, kao što je Veb Inspektor."
 
 #: ../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 "Inform other users when you are typing to them"
+msgstr "Obaveštava ostale korisnike kada im pišete poruku"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Da li Pismonoša da koristi sliku prijatelja kao ikonu u prozoru ćaskanja."
+"Da li će da pošalje stanja ćaskanja „sastavlja“ ili „pauziran“. Neće uticati na "
+"stanje „otišao“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h: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 "Use theme for chat rooms"
+msgstr "Koristi teme za sobe ćaskanja"
 
-# 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."
+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:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Da li da proverava pisanje re�i za izabrane jezike."
+msgid "Spell checking languages"
+msgstr "Jezici za proveru pisanja"
 
 #: ../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 ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Spisak jezika odvojen zarezima koje koristi provera pravopisa (npr. „sr, en, "
+"fr“)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Da li će biti uklju�en filter Pulse audia za uklanjanje odjeka."
+msgid "Enable spell checker"
+msgstr "Omogućava proveru pisanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji prijave na mrežu."
+msgid ""
+"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: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 "Nick completed character"
+msgstr "Znak za dovršavanje nadimka"
 
 #: ../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 ""
+"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: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 "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:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Da li da pusti obaveštajni zvuk na novi razgovor."
+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: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 "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: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 "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: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 "Camera device"
+msgstr "Uređaj kamerice"
 
 #: ../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 "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:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Da li da prikazuje obla�ić obaveštenja kada se prijatelj odjavi sa mreže."
+msgid "Camera position"
+msgstr "Položaj kamerice"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-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."
+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: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 "Echo cancellation support"
+msgstr "Podrška za uklanjanje odjeka"
 
 #: ../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 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:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Da li da prikazuje iznos gotovine naloga u spisku prijatelja."
+msgid "Show hint about closing the main window"
+msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
+"Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na "
+"„x“ dugme."
 
 #: ../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 publish the user's location"
+msgstr "Da li Pismonoša sme da objavljuje lokaciju korisnika"
 
 #: ../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 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: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 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: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 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:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Da li da prikazuje spisak prijatelja u zbijenom režimu."
+msgid "Empathy can use the 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:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na "
-"„x“ dugme."
+msgid "Whether Empathy can use the 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:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Da li da koristi temu za sobe razgovora."
+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:102
+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:103
+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:104
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano se "
-"koristi „name“ (sortiranje po imenu prijatelja). Ako je vrednost „state“, "
-"sortiranje se vrši po stanju prijatelja."
+"Da li Pismonoša da umanji preciznost lokacije zbog povećane privatnosti."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Upravljajte nalozima za dopisivanje i VoIP"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Nije naveden razlog"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Nalozi za dopisivanje i VoIP"
+#: ../libempathy/empathy-ft-handler.c: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:825
+#: ../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: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 +587,138 @@ msgstr "Poziv korisnika %s"
 msgid "Call from %s"
 msgstr "Poziv od %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Vrsta priklju�ka nije podržana"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Nije naveden razlog"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Zahtevana je promena stanja"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Obustavili ste prenos datoteke"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Druga strana je prekinula prenos datoteke"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Greška prilikom prenosa datoteke"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Druga strana nije u mogućnosti da prenese datoteku"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Nepoznat razlog"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Odsutan"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Nepovezan"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Nije naveden razlog"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Stanje je postavljeno na „nepovezan“"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/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 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 +726,31 @@ msgstr ""
 "Dužina sertifikata servera, ili dubina lanca sertifikata servera premašuje "
 "granice biblioteke za Å¡ifrovanje"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Vaš softver je previše star"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Unutrašnja greška"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Ljudi u okolini"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Jahu! Japan"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Gugl razgovor"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Fejsbuk ćaskanje"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -744,7 +759,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 +768,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 +777,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 +786,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 +795,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 +804,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:336
 msgid "Account"
 msgstr "Nalog"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Moji veb nalozi"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Nalog %s je izmenjen putem %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Nalog %s ne može biti uređivan iz Pismonoše."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Pokreni Moje veb naloge"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Izmeni %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Korisni�ko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Primeni"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Prijavi _me"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Ovaj nalog već postoji na serveru"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Napravi novi nalog na serveru"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "Po_ništi"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s nalog"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Novi nalog"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Primer:</b> MojNadimak"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Lozinka:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Napredno"
+msgid "Screen _Name:"
+msgstr "_Nadimak:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Primer:</b> MojNadimak"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Lozinka:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Zapamti lozinku"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Zapamti lozinku"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Zapamti lozinku"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nadimak:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Koja je vaša AIM lozinka?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Napredno"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Koji je vaš AIM nadimak?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "Koja je vaša AIM lozinka?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Primer:</b> korisni�ko_ime"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Zapamti lozinku"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_Korisni�ko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Primer:</b> korisni�ko_ime"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Koji je vaš Group Vajz korisni�ki IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Koja je vaša Group Vajz lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICKu _KIB:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Primer:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Kodni r_aspored:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICKu _KIB:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Koji je vaš ICKu KIB?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Koja je vaša ICKu lozinka?"
 
@@ -1043,11 +1030,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 +1054,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 +1070,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 +1095,203 @@ msgstr ""
 "Ukoliko nemate korisni�ko ime za Fejsbuk, idite na <a href=\"http://www."
 "facebook.com/username/\">ovu stranu</a> da ga izaberete."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Koristi stari SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Koja je vaša Fejsbuk lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Koje je vaše Fejsbuk korisni�ko ime?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Koji je vaš Gugl IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Primer:</b> korisnik@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Koja je vaša Gugl lozinka?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Primer:</b> korisnik@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Zanemari greške SSL sertifikata"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_Prioritet:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Resurs:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Zahteva se _Å¡ifrovanje(TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Koristi stari SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Prevaziđi postavke servera"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Koji je vaš Džaber IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Koja je vaša Džaber lozinka?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Koji je vaš željeni Džaber IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Koja je vaša Džaber lozinka?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Koja ja vaša željena Džaber lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Primer:</b> korisnik@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Koji je vaš Vindouz Uživo IB ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Koja je vaša Vindouz Uživo lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Adresa _e-pošte:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Nadimak:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Prezime:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Ime:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Ime za _objavu:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Džaber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Prezime:"
+msgid "E-_mail address:"
+msgstr "Adresa _e-pošte:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Ime za _objavu:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Korisni�ko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Primer:</b> korisnik@moj.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Korisni�ko ime za prijavu:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Otkrij povezivanja"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Automatski otkrij STUN server"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Koristi ovaj nalog za pozive _linijskih i mobilnih telefona"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Zanemari TLS greške"
+msgid "NAT Traversal Options"
+msgstr "Opcije prolaska kroz NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Period (u sekundama)"
+msgid "Proxy Options"
+msgstr "Opcije posrednika"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opcije za održavanje stalne veze"
+msgid "Miscellaneous Options"
+msgstr "Razne opcije"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Slabo rutiranje"
+msgid "STUN Server:"
+msgstr "STUN server:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mehanizam:"
+msgid "Discover the STUN server automatically"
+msgstr "Automatski otkrij STUN server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Razne opcije"
+msgid "Discover Binding"
+msgstr "Otkrij povezivanja"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opcije prolaska kroz NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opcije za održavanje stalne veze"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mehanizam:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opcije posrednika"
+msgid "Interval (seconds)"
+msgstr "Period (u sekundama)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Korisni�ko ime za prijavu:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN server:"
+msgid "Loose Routing"
+msgstr "Slabo rutiranje"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Server:"
+msgid "Ignore TLS Errors"
+msgstr "Zanemari TLS greške"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Koristi ovaj nalog za pozive _linijskih i mobilnih telefona"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Koja je lozinka za vaš SIP nalog?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Koja je identifikacija za SIP prijavu?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Korisni�ko ime:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Koja je lozinka za vaš SIP nalog?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Jahu! I_B:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Zanemari pozivnice za pri�aonice i konferencije"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Lok_alni spisak soba:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Koji je vaš Jahu! IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Koja je vaša Jahu! lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Jahu! I_B:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Lok_alni spisak soba:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1343,7 +1330,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 +1350,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:728
 msgid "Failed to open private chat"
 msgstr "Nisam uspeo da otvorim privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:786
 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:792
 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:991
 #, 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:1086
 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:1089
 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:1092
 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:1095
 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:1099
 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:1103
 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:1106
 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:1109
 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:1112
 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:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1429,11 +1420,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:1120
 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:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1441,113 +1432,126 @@ msgstr ""
 "/help [<komanda>]: prikazuje sve podržane naredbe. Ako se da i konkretna "
 "<naredba>, prikazuje njeno uputstvo za upotrebu."
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Korišćenje: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Nepoznata naredba"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1313
 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:1564
 msgid "insufficient balance to send message"
 msgstr "nema dovoljno gotovine za slanje poruke"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Greška pri slanju poruke „%s“: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "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:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "nema dovoljno gotovine za slanje poruke. <a href='%s'>Dopunite</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "nesposoban"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "nepovezan"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "neispravan prijatelj"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "pristup je zabranjen"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "poruka je preduga"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "nije podržano"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1639
 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:1706 ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema je postavljena na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Temu je postavio %s na: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Tema nije postavljena"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(nema predloga)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "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:2349
 #, 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:2419
 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:2437
+#: ../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:2494
 msgid "_Spelling Suggestions"
 msgstr "Predlozi pravopi_sa"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2583
 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:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s je otišao sa veze"
@@ -1555,12 +1559,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:2729
 #, 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:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s je izba�en"
@@ -1568,17 +1572,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:2740
 #, 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:2743
 #, c-format
 msgid "%s was banned"
 msgstr "Korisniku %s je zabranjen pristup"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je napustio(la) pri�aonicu"
@@ -1588,17 +1592,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:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s je pristupio(la) pri�aonici"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je sada poznat kao %s"
@@ -1606,90 +1610,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:2993
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3657
 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:3663
 msgid "Remember"
 msgstr "Zapamti"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Ne sada"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../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:3721
 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:3851
 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:3878
 msgid "Join"
 msgstr "Priklju�i se"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Povezan"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4125
 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:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Nepoznati ili neispravan identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokiranje prijatelja je trenutno nedostupno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Blokiranje prijatelja nije dostupno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Pristup je zabranjen"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Ne mogu da blokiram prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Izmeni blokirane prijatelje"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Nalog:"
 
@@ -1699,63 +1703,54 @@ msgstr "Blokirani prijatelji"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Ukloni"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Umnoži adresu veze"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Otvori vezu"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Izmeni podatke kontakta"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Podaci o profilu"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Novi prijatelj"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blokirati %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Da li ste sigurni da želite da blokirate da vas „%s“ više ne kontaktira?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "P_rijavi ovaj kontakt za zloupotrebu"
@@ -1764,401 +1759,315 @@ msgstr[2] "P_rijavi ove kontakte za zloupotrebu"
 msgstr[3] "P_rijavi ovaj kontakt za zloupotrebu"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Od_lu�i kasnije"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Zahtev za pretplatu"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Blokiraj korisnika"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Negrupisano"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Omiljeni ljudi"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Da li ste sigurni da želite da uklonite grupu „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Uklanjam grupu"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Da li ste sigurni da želite da uklonite prijatelja „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Uklanjam prijatelja"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "Dod_aj prijatelja…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Blokiraj kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "Ća_skanje"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audio poziv"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Video poziv"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Prethodni razgovori"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Pošalji datoteku"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Podeli moju radnu površ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Omiljeni"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Podaci"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "Izm_eni"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Pozivam vas u ovu sobu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "Pozov_i u sobu za ćaskanje"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Od_lu�i kasnije"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Pretraži kontakte"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Pretraga:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "Dod_aj prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nije pronađen nijedan prijatelj"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Poruka koja vas predstavlja:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Molim vas obavestite ne kada ste na mreži. Hvala!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Izaberite prijatelja"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Puno ime:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Broj telefona:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Adresa e-pošte:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Veb stranica:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Rođendan:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Viđen pre:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Povezan sa:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Poruka za odsutnost:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanali:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ISO kod države:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Država:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Republika:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Grad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Oblast:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Poštanski kod:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Zgrada:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Sprat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "Adresa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Nivo ta�nosti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Greška:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Uspravna greška (u metrima):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Vodoravna greška (u metrima):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Brzina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Pravac:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Brzina penjanja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Poslednji put ažurirano:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Geografska dužina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Geografska Å¡irina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Visina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Lokacija"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%d.%Y u %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Sa�uvaj sliku"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Ne mogu da sa�uvam sliku"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Lokacija</b> u (datum)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Nadimak:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Podaci o klijentu"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Program:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Li�ni podaci"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Detalji o prijatelju"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Ime i prezime"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Broj telefona"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Adresa el. pošte"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Veb stranica"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Rođendan"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Viđen pre:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Povezan sa:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Poruka za odsutnost:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "posao"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "kuća"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobilni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "glasovni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "prvenstveni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "poštanski"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "pošiljka"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifikator:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Nadimak:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Lokacija</b> u (datum)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Zahtevani su podaci…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Podaci o klijentu"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Izdanje:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Program:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2166,21 +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:1970
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Sledeći identitet će biti blokiran:"
@@ -2188,7 +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,144 @@ msgstr[1] "Sledeći identiteti ne mogu biti blokirani:"
 msgstr[2] "Sledeći identiteti ne mogu biti blokirani:"
 msgstr[3] "Sledeći identitet ne može biti blokiran:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Povezani prijatelji"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Izaberite prijatelja za povezivanje"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Pregled novog prijatelja"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Ozna�eni prijatelji na spisku levo će biti uvezani zajedno."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Izmeni podatke kontakta"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Izaberite nalog koji će biti korišćen za poziv"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c: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 "gnome-contacts not installed"
+msgstr "program gnomovi kontakti nije instaliran"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Instalirajte „gnome-contacts“ da pristupite podacima kontakata."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Podaci"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Poveži kontakte…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1175
+msgid "Inviting you to this room"
+msgstr "Pozivam vas u ovu sobu"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Pozov_i u sobu za ćaskanje"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "Dod_aj prijatelja…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Izbriši i _blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Da li ste sigurni da želite da uklonite grupu „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Uklanjam grupu"
+
+#. 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: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 +2251,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 +2268,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 +2297,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 +2347,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 +2356,197 @@ msgstr[1] "%s minuta"
 msgstr[2] "%s minuta"
 msgstr[3] "jednog minuta"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c: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 contact is offline"
+msgstr "Kontakt nije na vezi"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Navedeni kontakt ili je neispravan ili nepoznat"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontakt ne podržava ovu vrstu razgovora"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Zahtevana funkcionalnost nije primenjena za ovaj protokol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Ne mogu da zapo�nem razgovor sa datim kontaktom"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Izba�eni ste sa ovog kanala"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Ovaj kanal je pun"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Morate biti pozvani da se pridružite ovom kanalu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Ne mogu da nastavim dok je veza prekinuta"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Zabranjen pristup"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Došlo je do greške prilikom zapo�injanja razgovora"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c: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
+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
+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 "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 +2583,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 +2602,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 +2661,12 @@ msgstr "Poziv za razgovor je završen"
 msgid "Edit Custom Messages"
 msgstr "Uredi proizvoljne poruke"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Poruka je uređena %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normalno"
 
@@ -2766,34 +2743,38 @@ msgid "Certificate hostname: %s"
 msgstr "Ime domaćina sertifikata: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Nastavi"
+msgid "C_ontinue"
+msgstr "_Nastavi"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Nepoverljiva veza"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ova veza nije od poverenja. Želite li ipak da nastavite?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Zapamti ovaj izbor za naredne veze"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalji sertifikata"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c: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 +2783,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 +2955,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 +3028,11 @@ msgstr ""
 "adresu: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gnomov program za brze poruke"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Danilo Å egan <dsegan@gmx.net>\n"
@@ -3071,222 +3044,73 @@ msgstr ""
 "\n"
 "Prevod.org — prevod na srpski jezik."
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Greška pri uvoženju naloga."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Greška pri obradi detalja naloga."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Greška pri pravljenju naloga."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Dogodila se greška."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Ispisana poruka greške: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Možete se ili vratiti i probati da ponovo unesete detalje naloga ili da "
-"zatvorite pomoćnika i dodate naloge kasnije iz menija „Izmeni“."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Došlo je do greške"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Koji tip naloga za ćaskanje imate?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Da li imate još neki nalog za ćaskanje koji želite da podesite?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Unesite detalje naloga"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Koji tip naloga za ćaskanje želite da napravite?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Da li želite da napravite još naloga za ćaskanje?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Unesite detalje novog naloga"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Sa Internet Pismonošom možete ćaskati i sa ljudima u blizini i sa prijateljima "
-"i kolegama koji koriste Gugl razgovor, AIM, Vindouz uživo i mnoge druge "
-"programe za ćaskanje. Sa mikrofonom i kamerom takođe možete da obavljate i "
-"audio i video pozive."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Da li imate nalog koji ste koristili sa nekim drugim programom za ćaskanje?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Da, uvezi detalje mog naloga iz "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Da, ja ću sam uneti detalje naloga"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Ne, želim novi nalog"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ne, za sada samo želim da vidim ljude u blizini"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Izaberite naloge koje želite da uvezete:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Da"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Ne, to je sve za sada"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Pismonoša može automatski da otkrije i ćaska sa ljudima koji su povezani na "
-"istu mrežu kao i vi. Ako želite da koristite ovu mogućnost, proverite da li "
-"su detalji ispod ta�ni. Lako ih možete izmeniti kasnije ili isklju�iti ovu "
-"mogućnost iz prozor�eta „Nalozi“."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Izmeni->Nalozi"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Za sada _ne želim da koristim ovu mogućnost"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Ne mogu da ćaskam sa ljudima povezanim na vašu lokalnu mrežu jer telepathy-"
-"salut nije instaliran. Ako želite da omogućite ovo, instalirajte paket "
-"telepathy-salut i napravite nalog „Ljudi u okolini“ iz prozor�eta „Nalozi“."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut nije instaliran"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asistent naloga za brze poruke i VoIP"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Dobrodošli u Internet Pismonošu"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Uvezite vaše postojeće naloge"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Unesite li�ne podatke"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:71
 #, 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:75
 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:347
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Povezujem se…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "Nepovezan — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Veza je prekinuta — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "Nepovezan — Nema mrežne konekcije"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "Nepoznato stanje"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:430
 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:533
+msgid "Edit Connection Parameters"
+msgstr "Uredite parametre povezivanja"
+
+#: ../src/empathy-accounts-dialog.c:696
+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:702
+msgid "Go online to edit your personal information."
+msgstr "Uspostavite vezu da uredite vaše li�ne podatke."
+
+#: ../src/empathy-accounts-dialog.c:787
+msgid "_Edit Connection Parameters..."
+msgstr "_Uredi parametre povezivanja..."
+
+#: ../src/empathy-accounts-dialog.c:1283
 #, 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:1287
 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:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3295,15 +3119,24 @@ 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:1699
 msgid "_Enable"
 msgstr "_Omogući"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "O_nemogući"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Presko�i"
+
+#: ../src/empathy-accounts-dialog.c:2087
+#| msgid "Connected"
+msgid "_Connect"
+msgstr "_Poveži se"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3315,19 +3148,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Dodaj…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "U�itavam podatke o nalogu"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Nijedan protokol nije instaliran"
+msgid "_Import…"
+msgstr "_Uvezi…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokol:"
+msgid "Loading account information"
+msgstr "U�itavam podatke o nalogu"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3335,148 +3164,133 @@ msgstr ""
 "Da dodate novi nalog, prvo morate da instalirate priklju�ke za sve protokole "
 "koje želite da koristite."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Uvezi…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+#| msgid "No protocol installed"
+msgid "No protocol backends installed"
+msgstr "Nisu instalirani pozadinci protokola"
 
-#: ../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"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Ljudi u okolini"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
 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:228
 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:1934
 #, 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:2178
 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:2180
 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:2182
 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:2184
 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:2186
 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
+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:3040
 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:3079
 #, 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:3084
 #, 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:3090
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3485,27 +3299,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:3096
 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:3100
 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:3103
 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:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3516,161 +3330,216 @@ msgstr ""
 "\">ovu grešku</a> i prika�ite dnevnike pokupljene iz prozora „Otklanjanje "
 "grešaka“ u meniju „Pomoć“."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3124
 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:3127
 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:3167
 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:3177
 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:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Kodek za dekodiranje:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "Mi_krofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Udaljeni kandidat:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "Po_dešavanja"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Lokalni kandidat:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "Pre_gled"
+msgid "Audio"
+msgstr "Audio"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:285
+msgid "Close this window?"
+msgstr "Da zatvorim ovaj prozor?"
+
+#: ../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 "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 "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 +3548,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 +3557,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 +3566,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 +3575,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 +3588,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 +3664,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:1562
 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:1568
 #, 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:1568
 #, 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:374
 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 +3767,105 @@ msgstr ""
 "Poruka: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s od %s pri %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Primam „%s“ od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Šaljem „%s“ za %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Greška pri primanju „%s“ od %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Greška pri primanju datoteke"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Greška pri slanju „%s“ za %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Greška pri slanju datoteke"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ je primljen od %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " „%s“ je poslat za %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Prenos datoteke je završen"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "ÄŒekam na odgovor druge strane"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Proveravam integritet datoteke „%s“"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Tražim heš datoteke „%s“"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Preostalo"
 
@@ -4008,7 +3877,12 @@ msgstr "Prenosi datoteka"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Ukloni završene, otkazane i neuspešne prenose datoteka sa spiska"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+#| msgid "Import"
+msgid "_Import"
+msgstr "_Uvezi"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4016,171 +3890,198 @@ msgstr ""
 "Nisam pronašao nijedan nalog za uvoz. Internet pismonoša trenutno podržava "
 "samo uvoženje naloga iz Pidžina."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Uvezite naloge"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Uvezi"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Izvor"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Unesite lozinku"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Veza je prekinuta"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Morate da podesite nalog da biste ovde videli kontakte."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nema poklapanja"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Izvinite, %s nalozi ne mogu biti korišćeni sve dok ne ažurirate vaš %s "
+"softver."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Ažuriraj softver..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Zatvori"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Ponovo se poveži"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Izmeni nalog"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Zatvori"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Dopuni %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Dopunite kredit naloga"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Dopuni..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Prijatelj"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"Morate da uklju�ite jedan od vaših naloga da biste ovde videli kontakte."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Morate da uklju�ite %s da biste ovde videli kontakte."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Spisak prijatelja"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Prijatelji na _mapi"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Podešavanja naloga"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Iznos gotovine"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Novi razgovor…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Pronađi u _spisku prijatelja"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Novi _poziv…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Pridruži se _omiljenim"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Traži prijatelje…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Uredi omiljene"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Prenosi _datoteka"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormalna veli�ina"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Nep_ovezani prijatelji"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Novi _poziv…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Prikaži _protokole"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normalna veli�ina sa _avatarima"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Iznos gotovine"
+
+#: ../src/empathy-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 +4094,27 @@ msgstr ""
 "Potrebna lozinka: %s\n"
 "ÄŒlanovi: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Da"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Ne mogu da pokrenem listanje spiska soba"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Ne mogu da zaustavim listanje spiska soba"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Ne mogu da u�itam spisak soba"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Pridruži se sobi"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4217,6 +4123,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 +4134,313 @@ msgstr ""
 "Unesite server koji ugošćava sobe, ili ostavite prazno ako su sobe na "
 "serveru na kojem vam je nalog"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Pridruži se sobi"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Ne mogu da u�itam spisak soba"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Spisak soba"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Soba:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Poruka je primljena"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Poruka je poslata"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Novi razgovor"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Prijatelj se prijavio"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Prijatelj se odjavio"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Nalog je na vezi"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Nalog nije na vezi"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Jezik"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Paja"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Jare"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Jao, kume, gotov sam!! Ja sam bivši �ovek!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Pajo, Å¡ta je bilo, Pajooo??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Kako šta je bilo?? Nema je više, ukrali su mi je!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Å ta su ti ukrali, Pajo?? Å taaaa??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Kako šta?? Ama lađu, ukrali su mi lađu!! Jao meni!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Sav o�ajan, Paja je prekinuo vezu."
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Postavke"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Prikaži slike _smešaka"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Prikaži spisak _prijatelja u sobama"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Izgled"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Ponašanje"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Zapo�ni ćaskanja u:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Tema ćaskanja:"
+msgid "new ta_bs"
+msgstr "novim _jezi�cima"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Isklju�i obaveštenja kada sam _odsutan ili zauzet"
+msgid "new _windows"
+msgstr "novim _prozorima"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Isklju�i zvuke kada sam _odsutan ili zauzet"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Prikaži dolazne događaje u obaveštajnoj zoni"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Sam se poveži nakon pokretanja"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Uklanjanje odjeka �ini da vaš glas drugoj osobi zvu�i jasnije, ali može da "
-"izazove probleme na nekim ra�unarima. Ako vi ili vaš sagovornik �ujete �udne "
-"šumove ili kr�anje za vreme poziva, pokušajte da isklju�ite uklanjanje odjeka i "
-"ponovo pokrenite poziv."
+msgid "Log conversations"
+msgstr "Zabeleži razgovore"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Omogući obaveštenja kada prijatelj dođe na mrežu"
+msgid "Behavior"
+msgstr "Ponašanje"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Omogući obaveštenja kada prijatelj ode sa mreže"
+msgid "General"
+msgstr "Opšte"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Omogući obaveštenja kada _ćaskanja nisu u fokusu"
+msgid "_Enable bubble notifications"
+msgstr "_Omogući obaveštenja u obla�ićima"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Omogući proveru pravopisa za sledeće jezike:"
+msgid "Disable notifications when _away or busy"
+msgstr "Isklju�i obaveštenja kada sam _odsutan ili zauzet"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Opšte"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Omogući obaveštenja kada _ćaskanja nisu u fokusu"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Ulazni nivo:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Omogući obaveštenja kada prijatelj dođe na mrežu"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Ja�ina ulaznog zvuka:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Omogući obaveštenja kada prijatelj ode sa mreže"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Obaveštenja"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Izvori lokacija:"
+msgid "_Enable sound notifications"
+msgstr "Omogući _zvu�na obaveštenja"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Zabeleži razgovore"
+msgid "Disable sounds when _away or busy"
+msgstr "Isklju�i zvuke kada sam _odsutan ili zauzet"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Obaveštenja"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Pusti zvuk za događaje"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Zvuci"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privatnost"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Koristi uklanjanje _odjeka da poboljšaš kvalitet poziva"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Umanjena ta�nost lokacije zna�i da će najta�niji objavljeni podaci o vašoj "
-"lokaciji biti grad i država.  GPS koordinate će biti ta�ne do 1. decimale."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Prikaži slike _smešaka"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Prikaži spisak _prijatelja u sobama"
+"Uklanjanje odjeka �ini da vaš glas drugoj osobi zvu�i jasnije, ali može da "
+"izazove probleme na nekim ra�unarima. Ako vi ili vaš sagovornik �ujete �udne "
+"šumove ili kr�anje za vreme poziva, pokušajte da isklju�ite uklanjanje odjeka i "
+"ponovo pokrenite poziv."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Zvuci"
+msgid "_Publish location to my contacts"
+msgstr "Objavi lokaciju mojim _prijateljima"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Provera pisanja"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane "
-"re�nike."
+"Umanjena ta�nost lokacije zna�i da će najta�niji objavljeni podaci o vašoj "
+"lokaciji biti grad i država.  GPS koordinate će biti ta�ne do 1. decimale."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Teme"
+msgid "_Reduce location accuracy"
+msgstr "Umanji _ta�nost lokacije"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Varijanta:"
+msgid "Privacy"
+msgstr "Privatnost"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "_Sam se poveži nakon pokretanja"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobilni telefon"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "_Omogući obaveštenja u obla�ićima"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Mreža (IP, beži�na)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "Omogući _zvu�na obaveštenja"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Location sources:"
+msgstr "Izvori lokacija:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Mreža (IP, beži�na)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane "
+"re�nike."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Otvaraj ćaskanja u novim prozorima"
+msgid "Enable spell checking for languages:"
+msgstr "Omogući proveru pravopisa za sledeće jezike:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "Objavi lokaciju mojim _prijateljima"
+msgid "Spell Checking"
+msgstr "Provera pisanja"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "_Tema ćaskanja:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "Umanji _ta�nost lokacije"
+msgid "Variant:"
+msgstr "Varijanta:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Teme"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stanje"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Pozovi prijatelja ponovo"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Isklj. kameru"
+msgid "Redial"
+msgstr "Ponovo zovi"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Uklj. kameru"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Isklj. video"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Onemogući kameru i prestani da šalješ video"
+msgid "Video Preview"
+msgstr "Pregled videa"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Omogući kameru i šalji video"
+msgid "Video On"
+msgstr "Uklj. video"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Omogući kameru, ali ne šalji video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Pozovi prijatelja ponovo"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Pregled"
+msgid "Camera Off"
+msgstr "Isklj. kameru"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ponovo zovi"
+msgid "Disable camera and stop sending video"
+msgstr "Onemogući kameru i prestani da šalješ video"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Pregled"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Isklj. video"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Omogući kameru, ali ne šalji video"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Uklj. video"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Uklj. kameru"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Pregled videa"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Omogući kameru i šalji video"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Mapa prijatelja"
 
@@ -4597,96 +4507,96 @@ 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"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Ne prikazuj nijedno prozor�e; uradi posao koji imaš (npr. uvoženje) i izađi"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ne prikazuj nijedno prozor�e osim ako ne postoje samo nalozi „Ljudi u blizini“"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Po�etno izabiranje datog naloga (npr. gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<identifikacija naloga>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— Nalozi Pismonoše"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Nalozi Pismonoše"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Prikaži posebnu uslugu"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "— Otklanjanje grešaka Pismonoše"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Otklanjanje grešaka Pismonoše"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "— Pismonoša program za ćaskanje"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c: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:1572
 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:1573
 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 +4607,340 @@ 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:1179 ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "Na �ekanju"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Utišaj"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Trajanje"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3214
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Vaše trenutno stanje je %s."
+
+#: ../src/empathy-call-window.c:3218
+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:3220
+msgid "Top Up"
+msgstr "Dopuni"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Uporedi veli�inu slova"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Koji tip naloga za ćaskanje imate?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Dodajem novi nalog"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Ljudi u okolini"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+#| msgid ""
+#| "Empathy can automatically discover and chat with the people connected on "
+#| "the same network as you. If you want to use this feature, please check "
+#| "that the details below are correct. You can easily change these details "
+#| "later or disable this feature by using the 'Accounts' dialog"
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Pismonoša može automatski da otkrije i ćaska sa ljudima koji su povezani na "
+"istu mrežu kao i vi. Ako želite da koristite ovu mogućnost, proverite da li "
+"su detalji ispod ta�ni."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Možete kasnije da izmenite te detalje ili da isklju�ite ovu mogućnost tako što "
+"ćete izabrati <span style=\"italic\">Uredi → Nalozi</span> sa spiska "
+"kontakata."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Greška pri uvoženju naloga."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Greška pri obradi detalja naloga."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Greška pri pravljenju naloga."
+
+#~ msgid "There was an error."
+#~ msgstr "Dogodila se greška."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Ispisana poruka greške: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Možete se ili vratiti i probati da ponovo unesete detalje naloga ili da "
+#~ "zatvorite pomoćnika i dodate naloge kasnije iz menija „Izmeni“."
+
+#~ msgid "An error occurred"
+#~ msgstr "Došlo je do greške"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Da li imate još neki nalog za ćaskanje koji želite da podesite?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Unesite detalje naloga"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Koji tip naloga za ćaskanje želite da napravite?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Da li želite da napravite još naloga za ćaskanje?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Unesite detalje novog naloga"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Sa Internet Pismonošom možete ćaskati i sa ljudima u blizini i sa "
+#~ "prijateljima i kolegama koji koriste Gugl razgovor, AIM, Vindouz uživo i "
+#~ "mnoge druge programe za ćaskanje. Sa mikrofonom i kamerom takođe možete da "
+#~ "obavljate i audio i video pozive."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "Da li imate nalog koji ste koristili sa nekim drugim programom za ćaskanje?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Da, uvezi detalje mog naloga iz "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Da, ja ću sam uneti detalje naloga"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Ne, želim novi nalog"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Ne, za sada samo želim da vidim ljude u blizini"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Izaberite naloge koje želite da uvezete:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Ne, to je sve za sada"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Izmeni->Nalozi"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Za sada _ne želim da koristim ovu mogućnost"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Ne mogu da ćaskam sa ljudima povezanim na vašu lokalnu mrežu jer telepathy-"
+#~ "salut nije instaliran. Ako želite da omogućite ovo, instalirajte paket "
+#~ "telepathy-salut i napravite nalog „Ljudi u okolini“ iz prozor�eta „Nalozi“."
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut nije instaliran"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Asistent naloga za brze poruke i VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Dobrodošli u Internet Pismonošu"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Uvezite vaše postojeće naloge"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Unesite li�ne podatke"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokol:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Prikazuje pomoćnika naloga"
+
+#~ msgid "Call volume"
+#~ msgstr "Ja�ina zvuka poziva"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Ja�ina zvuka poziva, u procentima."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Pismonoša je prebacio dnevnike iz leptira"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Da li je Pismonoša prebacio dnevnike iz leptira."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Vrsta priklju�ka nije podržana"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Moji veb nalozi"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Nalog %s je izmenjen putem %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Nalog %s ne može biti uređivan iz Pismonoše."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Pokreni Moje veb naloge"
+
+#~ msgid "Edit %s"
+#~ msgstr "Izmeni %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "Po_ništi"
+
+#~ msgid "Personal Information"
+#~ msgstr "Podaci o profilu"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Negrupisano"
+
+#~ msgid "Favorite People"
+#~ msgstr "Omiljeni ljudi"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "Izm_eni"
+
+#~ msgid "Select a contact"
+#~ msgstr "Izaberite prijatelja"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Povezani prijatelji"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Izaberite prijatelja za povezivanje"
+
+#~ msgid "New contact preview"
+#~ msgstr "Pregled novog prijatelja"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Ozna�eni prijatelji na spisku levo će biti uvezani zajedno."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Poveži kontakte…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Poveži prijatelje"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Razveži…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Razdvaja uvezane kontakte u posebne prijatelje."
+
+#~ msgid "_Link"
+#~ msgstr "_Uveži"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Da razvežem uvezanog prijatelja „%s“?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Da li ste sigurni da želite da razvežete uvezanog prijatelja? Ovim ćete "
+#~ "razdvojiti uvezane kontakte u posebne prijatelje."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Razveži"
+
+#~ msgid "Contact ID:"
+#~ msgstr "IB prijatelja:"
+
+#~ msgid "C_hat"
+#~ msgstr "Ć_askaj"
+
+#~ msgid "Send _Video"
+#~ msgstr "Pošalji _video"
+
+#~ msgid "C_all"
+#~ msgstr "_Pozovi"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Postavite vaše prisustvo i trenutno stanje"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Izabrani prijatelj ne može da primi datoteke."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Izabrani prijatelj nije na vezi."
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Ovim ćete napraviti novi nalog, zanemarivši unete izmene.\n"
+#~ "Da li sigurno želite da nastavite?"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Li�ni _podaci"
+
+#~ msgid "Input level:"
+#~ msgstr "Ulazni nivo:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Ja�ina ulaznog zvuka:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Otvaraj ćaskanja u novim prozorima"
+
 #~ msgid "All"
 #~ msgstr "Sve"
 
diff --git a/po/sv.po b/po/sv.po
index 6848369d7..0841c9c33 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,8 +1,8 @@
 # Swedish messages for Empathy.
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 # Richard Hult <richard@imendio.com>, 2002, 2003.
 # Christian Rose <menthos@menthos.com>, 2003, 2004.
-# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011.
+# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
 #
 # Snälla, ta *INTE* bort de extra #~-meddelandena på slutet.
 #
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-17 06:33+0200\n"
-"PO-Revision-Date: 2011-10-17 06:35+0100\n"
+"POT-Creation-Date: 2012-02-19 00:52+0100\n"
+"PO-Revision-Date: 2012-02-19 00:56+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -21,456 +21,494 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Chatta på Google Talk, Facebook, MSN och många andra chattjänster"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Snabbmeddelandeklient"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Meddelandeklienten Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Snabbmeddelandeklient"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chatta på Google Talk, Facebook, MSN och många andra chattjänster"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "Meddelande och VoIP-konton"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Hantera konton för meddelanden och VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Öppna alltid ett separat fönster för nya chattar."
+msgid "Connection managers should be used"
+msgstr "Anslutningshanterare ska användas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Samtalsvolym"
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Huruvida anslutningshanterare ska användas för att automatiskt koppla från/återansluta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Samtalsvolym, som en procentandel."
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy ska ansluta automatiskt vid uppstart"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Kameraenhet"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Kameraposition"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy ska ställa in automatiskt frånvaro vid inaktivitet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) används i gruppchatt."
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Huruvida Empathy automatiskt ska gå in i frånvaroläge om användaren är inaktiv."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Chattfönstertema"
+msgid "Empathy default download folder"
+msgstr "Standardhämtningsmapp för Empathy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Temavariant för chattfönster"
+msgid "The default folder to save file transfers in."
+msgstr "Standardmappen att spara filöverföringar i."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Kommaseparerad lista av språk att använda för stavningskontroll (t.ex. \"sv, en, fr\")."
+msgid "Show offline contacts"
+msgstr "Visa frånkopplade kontakter"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Kompakt kontaktlista"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Huruvida frånkopplade kontakter ska visas i kontaktlistan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Anslutningshanterare ska användas"
+msgid "Show avatars"
+msgstr "Visa profilbilder"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Sorteringskriteria för kontaktlista"
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Huruvida profilbilder ska visas för kontakter i kontaktlistan och chattfönster."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "Sökväg för D-Bus-objektet för senaste kontot valt för att gå in i ett rum."
+msgid "Show protocols"
+msgstr "Visa protokoll"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Standardenhet för kamera att använda i videosamtal, t.ex. /dev/video0."
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Huruvida protokoll för kontakter ska visas i kontaktlistan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Default directory to select an avatar image from"
-msgstr "Standardkatalog att välja en profilbild från"
+msgid "Show Balance in contact list"
+msgstr "Visa saldo i kontaktlista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable popup notifications when away"
-msgstr "Inaktivera popupnotifieringar under frånvaro"
+msgid "Whether to show account balances in the contact list."
+msgstr "Huruvida kontosaldon ska visas i kontaktlistan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Disable sounds when away"
-msgstr "Inaktivera ljud under frånvaro"
+msgid "Compact contact list"
+msgstr "Kompakt kontaktlista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Display incoming events in the status area"
-msgstr "Visa inkommande händelser i statusytan"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Huruvida kontaktlistan ska visas i kompakt läge."
 
+# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
+# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Visa inkommande händelser i statusytan. Om false, visa dem direkt för användaren."
+msgid "Hide main window"
+msgstr "Dölj huvudfönstret"
 
+# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
+# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Echo cancellation support"
-msgstr "Stöd för ekosläckning"
+msgid "Hide the main window."
+msgstr "Dölj huvudfönstret."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can publish the user's location"
-msgstr "Empathy kan publicera användarens plats"
+msgid "Default directory to select an avatar image from"
+msgstr "Standardkatalog att välja en profilbild från"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy kan använda GPS:en för att gissa platsen"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Den senaste katalogen som en profilbild valdes från."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy kan använda mobiltelefonnätet för att gissa platsen"
+msgid "Open new chats in separate windows"
+msgstr "Öppna nya chattar i separata fönster"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy kan använda nätverket för att gissa platsen"
+msgid "Always open a separate chat window for new chats."
+msgstr "Öppna alltid ett separat fönster för nya chattar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy default download folder"
-msgstr "Standardhämtningsmapp för Empathy"
+msgid "Display incoming events in the status area"
+msgstr "Visa inkommande händelser i statusytan"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy ska ställa in automatiskt frånvaro vid inaktivitet"
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Visa inkommande händelser i statusytan. Om false, visa dem direkt för användaren."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy ska ansluta automatiskt vid uppstart"
+msgid "The position for the chat window side pane"
+msgstr "Positionen för chattfönstrets sidopanel"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy bör minska precisionen för platsen"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Den lagrade positionen (i bildpunkter) för chattfönstrets sidopanel."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy ska använda profilbilden för kontakten som ikon i chattfönstret"
+msgid "Show contact groups"
+msgstr "Visa kontaktgrupper"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Aktivera utvecklingsverktyg för WebKit"
+msgid "Whether to show groups in the contact list."
+msgstr "Huruvida grupper ska visas i kontaktlistan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Aktivera popupnotifieringar för nya meddelanden"
+msgid "Contact list sort criterion"
+msgstr "Sorteringskriteria för kontaktlista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Aktivera stavningskontroll"
+#, fuzzy
+msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name."
+msgstr "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstånd."
 
-# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
-# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Dölj huvudfönstret"
+msgid "Use notification sounds"
+msgstr "Använd notifieringsljud"
 
-# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
-# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Dölj huvudfönstret."
+msgid "Whether to play a sound to notify of events."
+msgstr "Huruvida ett ljud ska spelas upp för att notifiera om händelser."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Last account selected in Join Room dialog"
-msgstr "Senast kontot valt i GÃ¥ in i rum-dialogen"
+msgid "Disable sounds when away"
+msgstr "Inaktivera ljud under frånvaro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Nick completed character"
-msgstr "Tecken för smeknamnskomplettering"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Huruvida ljudnotifieringar ska spelas upp vid frånvaro eller upptagen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Open new chats in separate windows"
-msgstr "Öppna nya chattar i separata fönster"
+msgid "Play a sound for incoming messages"
+msgstr "Spela upp ljud för inkommande meddelanden"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use"
-msgstr "Sökväg för Adium-temat att använda"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Huruvida ett ljud ska spelas upp för inkommande meddelanden."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Sökväg för Adium-temat som ska användas om temat som används för chatt är Adium."
+msgid "Play a sound for outgoing messages"
+msgstr "Spela upp ljud för utgående meddelanden"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for incoming messages"
-msgstr "Spela upp ljud för inkommande meddelanden"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Huruvida ett ljud ska spelas upp för utgående meddelanden."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Spela upp ett ljud för nya samtal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound for outgoing messages"
-msgstr "Spela upp ljud för utgående meddelanden"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Huruvida ett ljud ska spelas upp för nya samtal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Spela upp ljud när en kontakt loggar in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when a contact logs out"
-msgstr "Spela upp ett ljud när en kontakt loggar ut"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar in i nätverket."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log in"
-msgstr "Spela upp ljud när vi loggar in"
+msgid "Play a sound when a contact logs out"
+msgstr "Spela upp ett ljud när en kontakt loggar ut"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Play a sound when we log out"
-msgstr "Spela upp ljud när vi loggar ut"
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar ut från nätverket."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Visa popupnotifieringar om chatten inte är fokuserad"
+msgid "Play a sound when we log in"
+msgstr "Spela upp ljud när vi loggar in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs in"
-msgstr "Visa popupnotifieringar när en kontakt loggar in"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Huruvida ett ljud ska spelas upp vid inloggning i ett nätverk."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Pop up notifications when a contact logs out"
-msgstr "Visa popupnotifieringar när en kontakt loggar ut"
+msgid "Play a sound when we log out"
+msgstr "Spela upp ljud när vi loggar ut"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Position the camera preview should be during a call."
-msgstr "Positionera kameravisningen som den ska vara under ett samtal."
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Huruvida ett ljud ska spelas upp vid utloggning från ett nätverk."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show Balance in contact list"
-msgstr "Visa saldo i kontaktlista"
+msgid "Enable popup notifications for new messages"
+msgstr "Aktivera popupnotifieringar för nya meddelanden"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show avatars"
-msgstr "Visa profilbilder"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show contact list in rooms"
-msgstr "Visa kontaktlista i rum"
+msgid "Disable popup notifications when away"
+msgstr "Inaktivera popupnotifieringar under frånvaro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show hint about closing the main window"
-msgstr "Visa tips om att stänga huvudfönstret"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Huruvida popupnotifieringar ska visas vid frånvaro eller upptagen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show offline contacts"
-msgstr "Visa frånkopplade kontakter"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Visa popupnotifieringar om chatten inte är fokuserad"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Show protocols"
-msgstr "Visa protokoll"
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "Spell checking languages"
-msgstr "Rättstavningsspråk"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Visa popupnotifieringar när en kontakt loggar in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The default folder to save file transfers in."
-msgstr "Standardmappen att spara filöverföringar i."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Huruvida popupnotifieringar ska visas när en kontakt ansluter."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Den senaste katalogen som en profilbild valdes från."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Visa popupnotifieringar när en kontakt loggar ut"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The position for the chat window side pane"
-msgstr "Positionen för chattfönstrets sidopanel"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Huruvida popupnotifieringar ska visas när en kontakt kopplar från."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Den lagrade positionen (i bildpunkter) för chattfönstrets sidopanel."
+msgid "Use graphical smileys"
+msgstr "Använd grafiska smilisar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Det tema som används för att visa samtal i chattfönster."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Huruvida smilisar ska omvandlas till grafiska bilder i samtal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "The theme variant that is used to display the conversation in chat windows."
-msgstr "Den temavariant som används för att visa samtalet i chattfönster."
+msgid "Show contact list in rooms"
+msgstr "Visa kontaktlista i rum"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use graphical smileys"
-msgstr "Använd grafiska smilisar"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Huruvida kontaktlistan ska visas i chattrum."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use notification sounds"
-msgstr "Använd notifieringsljud"
+msgid "Chat window theme"
+msgstr "Chattfönstertema"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Use theme for chat rooms"
-msgstr "Använd tema för chattrum"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Det tema som används för att visa samtal i chattfönster."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Huruvida Empathy kan publicera användarens plats till sina kontakter."
+msgid "Chat window theme variant"
+msgstr "Temavariant för chattfönster"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Huruvida Empathy kan använda GPS för att gissa platsen."
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "Den temavariant som används för att visa samtalet i chattfönster."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen."
+msgid "Path of the Adium theme to use"
+msgstr "Sökväg för Adium-temat att använda"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Sökväg för Adium-temat som ska användas om temat som används för chatt är Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart."
+msgid "Enable WebKit Developer Tools"
+msgstr "Aktivera utvecklingsverktyg för WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Huruvida Empathy automatiskt ska gå in i frånvaroläge om användaren är inaktiv."
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Huruvida utvecklingsverktyg för WebKit, såsom Webbinspekteraren, ska aktiveras."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl."
+msgid "Inform other users when you are typing to them"
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Huruvida Empathy ska använda profilbilden för kontakten som ikon i chattfönstret."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Huruvida utvecklingsverktyg för WebKit, såsom Webbinspekteraren, ska aktiveras."
+msgid "Use theme for chat rooms"
+msgstr "Använd tema för chattrum"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "Huruvida anslutningshanterare ska användas för att automatiskt koppla från/återansluta."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Huruvida temat för chattrum ska användas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Huruvida ord som matas in ska kontrolleras mot de språk som du vill kontrollera med."
+msgid "Spell checking languages"
+msgstr "Rättstavningsspråk"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Huruvida smilisar ska omvandlas till grafiska bilder i samtal."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Kommaseparerad lista av språk att använda för stavningskontroll (t.ex. \"sv, en, fr\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Huruvida Pulseaudios filter för ekosläckning ska aktiveras."
+msgid "Enable spell checker"
+msgstr "Aktivera stavningskontroll"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar in i nätverket."
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Huruvida ord som matas in ska kontrolleras mot de språk som du vill kontrollera med."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar ut från nätverket."
+msgid "Nick completed character"
+msgstr "Tecken för smeknamnskomplettering"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Huruvida ett ljud ska spelas upp för att notifiera om händelser."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) används i gruppchatt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Huruvida ett ljud ska spelas upp för inkommande meddelanden."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy ska använda profilbilden för kontakten som ikon i chattfönstret"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Huruvida ett ljud ska spelas upp för nya samtal."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Huruvida Empathy ska använda profilbilden för kontakten som ikon i chattfönstret."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Huruvida ett ljud ska spelas upp för utgående meddelanden."
+msgid "Last account selected in Join Room dialog"
+msgstr "Senast kontot valt i GÃ¥ in i rum-dialogen"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Huruvida ett ljud ska spelas upp vid inloggning i ett nätverk."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Sökväg för D-Bus-objektet för senaste kontot valt för att gå in i ett rum."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Huruvida ett ljud ska spelas upp vid utloggning från ett nätverk."
+msgid "Camera device"
+msgstr "Kameraenhet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Huruvida ljudnotifieringar ska spelas upp vid frånvaro eller upptagen."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Standardenhet för kamera att använda i videosamtal, t.ex. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Huruvida popupnotifieringar ska visas när en kontakt kopplar från."
+msgid "Camera position"
+msgstr "Kameraposition"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Huruvida popupnotifieringar ska visas när en kontakt ansluter."
+msgid "Position the camera preview should be during a call."
+msgstr "Positionera kameravisningen som den ska vara under ett samtal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad."
+msgid "Echo cancellation support"
+msgstr "Stöd för ekosläckning"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Huruvida Pulseaudios filter för ekosläckning ska aktiveras."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Huruvida kontosaldon ska visas i kontaktlistan."
+msgid "Show hint about closing the main window"
+msgstr "Visa tips om att stänga huvudfönstret"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Huruvida profilbilder ska visas för kontakter i kontaktlistan och chattfönster."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas när man klickar på \"x\"-knappen i titelraden."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Huruvida frånkopplade kontakter ska visas i kontaktlistan."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy kan publicera användarens plats"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Huruvida popupnotifieringar ska visas vid frånvaro eller upptagen."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Huruvida Empathy kan publicera användarens plats till sina kontakter."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Huruvida protokoll för kontakter ska visas i kontaktlistan."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy kan använda nätverket för att gissa platsen"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Huruvida kontaktlistan ska visas i chattrum."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Huruvida kontaktlistan ska visas i kompakt läge."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy kan använda mobiltelefonnätet för att gissa platsen"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas när man klickar på \"x\"-knappen i titelraden."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Huruvida temat för chattrum ska användas."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy kan använda GPS:en för att gissa platsen"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
-msgstr "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstånd."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Huruvida Empathy kan använda GPS för att gissa platsen."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Hantera konton för meddelanden och VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy bör minska precisionen för platsen"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Meddelande och VoIP-konton"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl."
+
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Ingen anledning angavs"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Ändring i tillstånd begärdes"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Du avbröt filöverföringen"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Den andra deltagaren avbröt filöverföringen"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Fel vid försök att överföra filen"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Den andra deltagaren kunde inte överföra filen"
+
+#: ../libempathy/empathy-ft-handler.c:754
+#: ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Okänd anledning"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Filöverföringen är färdig men filen blev skadad"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Filöverföringar stöds inte fjärrkontakten"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Den valda filen är inte en vanlig fil"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Den valda filen är tom"
 
@@ -491,462 +529,405 @@ msgstr "Ringde %s"
 msgid "Call from %s"
 msgstr "Samtal från %s"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "Uttagstypen stöds inte"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "Ingen anledning angavs"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "Ändring i tillstånd begärdes"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "Du avbröt filöverföringen"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "Den andra deltagaren avbröt filöverföringen"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "Fel vid försök att överföra filen"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "Den andra deltagaren kunde inte överföra filen"
-
-#: ../libempathy/empathy-tp-file.c:395
-#: ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Okänd anledning"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Frånvarande"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Frånkopplad"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Okänt"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ingen anledning angavs"
 
-#: ../libempathy/empathy-utils.c:286
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Status är inställd till frånkopplad"
 
-#: ../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:75
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Nätverksfel"
 
-#: ../libempathy/empathy-utils.c:290
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#: ../libempathy/empathy-utils.c:292
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Krypteringsfel"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Namnet används"
 
-#: ../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 "Certifikat inte tillhandahållet"
 
-#: ../libempathy/empathy-utils.c:298
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certifikatet är inte betrott"
 
-#: ../libempathy/empathy-utils.c:300
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certifikatet har gått ut"
 
-#: ../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 "Certifikatet är inte aktiverat"
 
-#: ../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 "Värdnamnet i certifikatet stämmer inte"
 
-#: ../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 "Certifikatets fingeravtryck stämmer inte"
 
-#: ../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 "Självsignerat certifikat"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Certifikatfel"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Kryptering är inte tillgängligt"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Certifikatet är ogiltigt"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Anslutningen vägrades"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Anslutningen kunde inte etableras"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Anslutningen förlorades"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Denna resurs är redan ansluten till servern"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Detta konto är redan anslutet till servern"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Anslutningen har ersatts av en ny anslutning med samma resurs"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Kontot finns redan på servern"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Servern är för tillfället för upptagen för att hantera anslutningen"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Certifikatet har spärrats"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Certifikatet använder en osäker skifferalgoritm eller är kryptografiskt svag"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Längd på servercertifikatet, eller djup för servercertifikatkedjan, överstiger begränsningen för krypteringsbiblioteket"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Din programvara är för gammal"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Internt fel"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Personer i närheten"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-chatt"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekund sedan"
 msgstr[1] "%d sekunder sedan"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minut sedan"
 msgstr[1] "%d minuter sedan"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d timme sedan"
 msgstr[1] "%d timmar sedan"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag sedan"
 msgstr[1] "%d dagar sedan"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d vecka sedan"
 msgstr[1] "%d veckor sedan"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d månad sedan"
 msgstr[1] "%d månader sedan"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "i framtiden"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Alla konton"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../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 "Mina webbkonton"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Kontot %s redigeras via %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Kontot %s kan inte redigeras i Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Starta Mina webbkonton"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Redigera %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "V_erkställ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "L_ogga in"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Detta konto finns redan på servern"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Skapa ett nytt konto på servern"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "Av_bryt"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nytt konto"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Exempel:</b> MittSkärmnamn"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "L_ösenord:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Avancerat"
+msgid "Screen _Name:"
+msgstr "Skärm_namn:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Exempel:</b> MittSkärmnamn"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "L_ösenord:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Kom ihåg lösenordet"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Kom ihåg lösenordet"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Kom ihåg lösenordet"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Skärm_namn:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Vad är ditt AIM-lösenord?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Avancerat"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Vad är ditt AIM-skärmnamn?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "Vad är ditt AIM-lösenord?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Exempel:</b> användarnamn"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Kom ihåg lösenordet"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "Inloggningsi_d:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Exempel:</b> användarnamn"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Vad är ditt användar-id för GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Vad är ditt lösenord för GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Exempel:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Te_ckenuppsättning:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Vad är ditt ICQ UIN?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Vad är ditt ICQ-lösenord?"
 
@@ -983,21 +964,25 @@ msgstr "Options"
 msgid "None"
 msgstr "Ingen"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Nätverk"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "Teckenuppsättning:"
+msgid "Network:"
+msgstr "Nätverk:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "De flesta IRC-servrar behöver inte något lösenord. Ange endast ett lösenord om du är säker på att det behövs."
+msgid "Character set:"
+msgstr "Teckenuppsättning:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Nätverk"
+msgid "Servers"
+msgstr "Servrar"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Nätverk:"
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "De flesta IRC-servrar behöver inte något lösenord. Ange endast ett lösenord om du är säker på att det behövs."
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -1015,48 +1000,20 @@ msgstr "Avslutningsmeddelande:"
 msgid "Real name:"
 msgstr "Verkligt namn:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Servrar"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Vad är ditt IRC-smeknamn?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Vilket IRC-nätverk?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Exempel:</b> användare@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Exempel:</b> användare@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Kr_yptering krävs (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnorera SSL-certifikatfel"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Åsidosätt serverinställningar"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Pri_oritet:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Vad är ditt IRC-smeknamn?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Resurs:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Vad är ditt användarnamn för Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1066,179 +1023,203 @@ msgstr ""
 "Om du har facebook.com/<b>hamster</b> så ange <b>hamster</b>.\n"
 "Använd <a href=\"http://www.facebook.com/username/\">denna sida</a> för att välja ett Facebook-användarnamn om du inte redan har ett."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Använd gammal SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Vad är ditt Facebook-lösenord?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Vad är ditt användarnamn för Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Vad är ditt Google ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Exempel:</b> användare@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Vad är ditt Google-lösenord?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Exempel:</b> användare@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnorera SSL-certifikatfel"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Pri_oritet:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Resurs:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Kr_yptering krävs (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Använd gammal SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Åsidosätt serverinställningar"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Vad är ditt Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Vad är ditt Jabber-lösenord?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Vilket Jabber ID vill du använda?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Vad är ditt Jabber-lösenord?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Vilket lösenord vill du använda för Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Exempel:</b> användare@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Vad är ditt id för Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Vad är ditt lösenord för Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-_postadress:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "S_meknamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Efternamn:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Förnamn:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Publikt namn:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber-id:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Efternamn:"
+msgid "E-_mail address:"
+msgstr "E-_postadress:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Publikt namn:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "A_nvändarnamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Exempel:</b> användare@min.sipserver"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Användarnamn för autentisering:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Upptäck bindning"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Upptäck STUN-servern automatiskt"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Använd detta konto för att ringa _fasta telefoner och mobiltelefoner"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorera TLS-fel"
+msgid "NAT Traversal Options"
+msgstr "Flaggor för NAT-traversering"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervall (sekunder)"
+msgid "Proxy Options"
+msgstr "Proxyalternativ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive-flaggor"
+msgid "Miscellaneous Options"
+msgstr "Diverse alternativ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Loose Routing"
+msgid "STUN Server:"
+msgstr "STUN-server:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mekanism:"
+msgid "Discover the STUN server automatically"
+msgstr "Upptäck STUN-servern automatiskt"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Diverse alternativ"
+msgid "Discover Binding"
+msgstr "Upptäck bindning"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Flaggor för NAT-traversering"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive-flaggor"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mekanism:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Proxyalternativ"
+msgid "Interval (seconds)"
+msgstr "Intervall (sekunder)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Användarnamn för autentisering:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN-server:"
+msgid "Loose Routing"
+msgstr "Loose Routing"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Server:"
+msgid "Ignore TLS Errors"
+msgstr "Ignorera TLS-fel"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Använd detta konto för att ringa _fasta telefoner och mobiltelefoner"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Vad är lösenordet för ditt SIP-konto?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Vad är ditt inloggnings-id för SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "A_nvändarnamn:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Vad är lösenordet för ditt SIP-konto?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo!-I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnorera inbjudningar till konferenser och chattrum"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Lokalanpassning för _rumslista:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Vad är ditt Yahoo! ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Vad är ditt Yahoo!-lösenord?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo!-I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Lokalanpassning för _rumslista:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1301,188 +1282,194 @@ msgstr "Nödsamtal stöds inte med detta protokollet"
 msgid "You don't have enough credit in order to place this call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Misslyckades med att öppna privat chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Ämne stöds inte för detta samtal"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Du tillåts inte att ändra ämnet"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" är inte ett giltigt kontakt-id"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: töm alla meddelanden från det aktuella samtalet"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ämne>: ställ in ämnet för det aktuella samtalet"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chattrummets ID>: gå in i ett nytt chattrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chattrummets ID>: gå in i ett nytt chattrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<chattrummets ID>] [<anledning>]: lämna chattrummet, det aktuella som standard"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontaktens ID> [<meddelande>]: öppna en privat chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontaktens ID> <meddelande>: öppna en privat chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <smeknamn>: ändra ditt smeknamn på aktuell server"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <meddelande>: skicka ett ACTION-meddelande till aktuellt samtal"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <meddelande>: skicka <meddelande> till det aktuella samtalet. Detta används för att skicka ett meddelande som börjar med ett \"/\". Till exempel: \"/say /join används för att gå in i ett nytt chattrum\""
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-id>: visa information om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<kommando>]: visa alla kommandon som stöds. Om <kommando> har definierats, visa dess användning."
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Användning: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Okänt kommando; se /help för tillgängliga kommandon"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "otillräckliga medel på kontot för att skicka meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:1461
-#: ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1568
+#: ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Fel vid sändning av meddelandet \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463
-#: ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1570
+#: ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fel vid sändning av meddelande: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, fuzzy, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "otillräckliga medel på kontot för att skicka meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "inte kapabel"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "frånkopplad"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "ogiltig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "Ã¥tkomst nekad"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "för långt meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "inte implementerat"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "okänt"
 
-#: ../libempathy-gtk/empathy-chat.c:1599
-#: ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706
+#: ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Ämne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Ämnet inställt till: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Ämnet angivet av %s till: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Inget ämne definierat"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Inga förslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Lägg till \"%s\" till ordbok"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Lägg till \"%s\" till %s-ordboken"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Infoga smilis"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
-#: ../libempathy-gtk/empathy-ui-utils.c:1843
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Skicka"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2373
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "Sta_vningsförslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2462
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Misslyckades med att hämta senaste loggar"
 
-#: ../libempathy-gtk/empathy-chat.c:2599
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har kopplat från"
@@ -1490,12 +1477,12 @@ msgstr "%s har kopplat från"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s sparkades ut av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s sparkades ut"
@@ -1503,17 +1490,17 @@ msgstr "%s sparkades ut"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2617
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s blev bannlyst av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s blev bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:2624
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har lämnat rummet"
@@ -1523,17 +1510,17 @@ msgstr "%s har lämnat rummet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2633
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2658
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har gått in i rummet"
 
-#: ../libempathy-gtk/empathy-chat.c:2683
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
@@ -1541,93 +1528,93 @@ msgstr "%s är nu känd som %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2836
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1260
-#: ../src/empathy-call-window.c:1546
-#: ../src/empathy-call-window.c:1596
-#: ../src/empathy-call-window.c:2642
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280
+#: ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595
+#: ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3482
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Vill du lagra detta lösenord?"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Kom ihåg"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Inte nu"
 
-#: ../libempathy-gtk/empathy-chat.c:3542
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Försök igen"
 
-#: ../libempathy-gtk/empathy-chat.c:3546
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Felaktigt lösenord. Försök igen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3676
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Detta rum är skyddat med ett lösenord:"
 
-#: ../libempathy-gtk/empathy-chat.c:3703
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "GÃ¥ in"
 
-#: ../libempathy-gtk/empathy-chat.c:3891
-#: ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:4070
+#: ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../libempathy-gtk/empathy-chat.c:3946
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Samtal"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3951
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Okänd eller ogiltig identifierare"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blockering av kontakter är för närvarande inte möjligt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Kontaktblockering är inte möjlig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Ã…tkomst nekad"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Kunde inte blockera kontakten"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:783
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Redigera blockerade kontakter"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1637,558 +1624,545 @@ msgstr "Blockerade kontakter"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Ta bort"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopiera länkadress"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Öppna länk"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %e %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Redigera kontaktinformation"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Personlig information"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blockera %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Är du säker på att du vill blockera \"%s\" från att kontakta dig igen?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blockera"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Rapportera denna kontakt som stötande"
 msgstr[1] "_Rapportera dessa kontakter som stötande"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Bestäm _senare"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Prenumerationsbegäran"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Blockera användare"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1935
-#: ../libempathy-gtk/empathy-individual-view.c:2375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Vill du verkligen ta bort gruppen \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1937
-#: ../libempathy-gtk/empathy-individual-view.c:2378
-msgid "Removing group"
-msgstr "Tar bort grupp"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
-msgid "_Remove"
-msgstr "_Ta bort"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2016
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Vill du verkligen ta bort kontakten \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2018
-#: ../libempathy-gtk/empathy-individual-view.c:2521
-msgid "Removing contact"
-msgstr "Tar bort kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Lägg till kontakt..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:292
-msgid "_Block Contact"
-msgstr "_Blockera kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:321
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Chatt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:353
-#: ../libempathy-gtk/empathy-individual-menu.c:850
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Ljudsamtal"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:386
-#: ../libempathy-gtk/empathy-individual-menu.c:895
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videosamtal"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-individual-menu.c:948
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "Ti_digare samtal"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:454
-#: ../libempathy-gtk/empathy-individual-menu.c:989
-msgid "Send File"
-msgstr "Skicka fil"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:477
-#: ../libempathy-gtk/empathy-individual-menu.c:1031
-msgid "Share My Desktop"
-msgstr "Dela ut mitt skrivbord"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:506
-#: ../libempathy-gtk/empathy-individual-menu.c:1094
-msgid "Infor_mation"
-msgstr "Infor_mation"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:552
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "R_edigera"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:606
-#: ../libempathy-gtk/empathy-individual-menu.c:1285
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Bjuder in dig till detta rum"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:637
-#: ../libempathy-gtk/empathy-individual-menu.c:1331
-msgid "_Invite to Chat Room"
-msgstr "_Bjud in till chattrum"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Bestäm _senare"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Sök efter kontakter"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Sök: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Lägg till kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Inga kontakter hittades"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Introducera dig själv:"
 
-#: ../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 "Jag skulle vilja kunna se när du är ansluten. Tack!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Fullständigt namn:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Telefonnummer:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-postadress:"
-
-# "Web site" är "webbplats". "Web page" är "webbsida".
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Webbplats:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Födelsedag:"
-
-#. 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 "SÃ¥gs senast:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Ansluten från:"
-
-#. 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 "Frånvaromeddelande:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Landets ISO-kod:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Land:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Län:"
 
-#: ../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 "Stad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Postnummer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Gata:"
 
-#: ../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 "Byggnad:"
 
-#: ../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 "VÃ¥ning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Precisionsnivå:"
 
-#: ../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 "Fel:"
 
-#: ../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 "Vertikalt fel (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horisontellt fel (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../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 "Riktning:"
 
-#: ../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 "Höjdökning:"
 
-#: ../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 "Senast uppdaterad:"
 
-#: ../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 "Longitud:"
 
-#: ../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 "Latitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Höjd:"
 
-#: ../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 "Plats"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y klockan %H.%M UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Spara profilbild"
 
-#: ../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 "Kunde inte spara profilbild"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1066
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Favorit"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personliga detaljer"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Plats</b> den (datum)\t"
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Kontaktuppgifter"
 
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Alias:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Fullständigt namn"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Klientinformation"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Telefonnummer"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Klient:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-postadress"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Kontaktuppgifter"
+# "Web site" är "webbplats". "Web page" är "webbsida".
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Webbplats"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Födelsedag"
+
+#. 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 "SÃ¥gs senast:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Ansluten från:"
+
+#. 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 "Frånvaromeddelande:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "arbete"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "hem"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobil"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "röst"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "föredragen"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postadress"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "leveransadress"
 
 #. 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 "Identifierare:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Alias:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Plats</b> den (datum)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Information begärd..."
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Klientinformation"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Version:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Klient:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
 msgstr "Välj de grupper som du vill att denna kontakt ska finnas i. Observera att du kan välja fler än en grupp eller inga grupper alls."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Lägg till grupp"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Välj"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1967
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupp"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Följande identitet kommer att blockeras:"
 msgstr[1] "Följande identiteter kommer att blockeras:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Följande identitet kan inte blockeras:"
 msgstr[1] "Följande identiteter kan inte blockeras:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Länkade kontakter"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Välj kontakter att länka"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Förhandsvisa ny kontakt"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Kontakter markerade i listan till vänster kommer att länkas ihop."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Redigera kontaktinformation"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Välj konto att använda för att ringa samtalet"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c: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 "Ring"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Arbete"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "HEM"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:805
-#: ../libempathy-gtk/empathy-new-message-dialog.c:295
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Blockera 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 "_Chatt"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1143
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Ljudsamtal"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videosamtal"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "Ti_digare samtal"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Skicka fil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Dela ut mitt skrivbord"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favorit"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts är inte installerat"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Infor_mation"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_edigera"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1169
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Länka kontakter..."
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Bjuder in dig till detta rum"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Bjud in till chattrum"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Lägg till kontakt..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Ta bort och _blockera"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Vill du verkligen ta bort gruppen \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Tar bort grupp"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Ta bort"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Vill du verkligen ta bort kontakten \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "Vill du verkligen ta bort den länkade kontakten \"%s\"? Observera att detta kommer att ta bort alla kontakter som denna länkade kontakt innehåller."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Tar bort kontakt"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2199,23 +2173,23 @@ msgstr[1] "Länkade kontakter innehåller %u kontakter"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Plats</b> den (datum)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Ansluten från en telefon eller mobil enhet"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nytt nätverk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Välj ett IRC-nätverk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Återställ _nätverkslistan"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Välj"
@@ -2228,293 +2202,253 @@ msgstr "ny server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Länka kontakter"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "A_vlänka..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "Dela helt upp den visade länkade kontakten till separata kontakter."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Länka"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Avlänka länkade kontakter \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
-msgstr "Är du säker på att du vill avlänka dessa länkade kontakter? Detta kommer helt att dela upp de länkade kontakterna till separata kontakter."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "Av_länka"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historik"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "Visa"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "Sök"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "Chatt i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "Chatt med %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekund"
 msgstr[1] "%s sekunder"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minut"
 msgstr[1] "%s minuter"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Samtalet tog %s, avslutades %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "Idag"
 
 # "Web site" är "webbplats". "Web page" är "webbsida".
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "Igår"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%B %e %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 "När som helst"
 
-#: ../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 "Vem som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "Vem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "När"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "Allting"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "Textchattar"
 
-#: ../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 "Samtal"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "Inkommande samtal"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "Utgående samtal"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "Missade samtal"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "Vad"
 
-#: ../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 "Är du säker på att du vill ta bort alla loggar för tidigare samtal?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "Töm allt"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "Ta bort från:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Läser in...</span>"
+msgid "_File"
+msgstr "_Arkiv"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chatta"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "R_edigera"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Ta bort all historik..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Chatta"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "R_edigera"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Arkiv"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "sida 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Kontakt-id:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Läser in...</span>"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:77
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Kontakten är frånkopplad"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:79
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
 msgstr "Den angivna kontakten är antingen ogiltig eller okänd"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
-msgstr "Ämne stöds inte för detta samtal"
+msgstr "Kontakten saknar stöd för denna typ av samtal"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
-msgstr ""
+msgstr "Begärd funktionalitet är inte implementerad för detta protokoll"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
-msgstr "Starta röst- eller videosamtal med denna kontakt"
+msgstr "Kunde inte starta ett samtal med denna kontakt"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:91
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "Du är bannlyst från denna kanal"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:93
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "Denna kanal är full"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
 msgstr "Du måste bli inbjuden för att gå in i denna kanal"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
-msgstr "Kontakten frånkopplad"
+msgstr "Kan inte fortsätta när frånkopplad"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
 msgstr "Ã…tkomst nekad"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
 msgstr "Det inträffade ett fel när samtalet startades"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:305
-msgid "C_hat"
-msgstr "C_hatta"
+#: ../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 "Ange en kontaktidentifierare eller telefonnummer:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:324
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Nytt samtal"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Skicka _video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "_Videosamtal"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "Rin_g"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "_Röstsamtal"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "Nytt samtal"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Autentisering misslyckades för kontot <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"
@@ -2551,12 +2485,8 @@ msgstr "Klicka för att göra denna status till favorit"
 msgid "Set status"
 msgstr "Ange status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Ange din närvaro och aktuell status"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Anpassade meddelanden..."
 
@@ -2574,20 +2504,20 @@ msgid "Find:"
 msgstr "Sök:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Mat_cha skiftläge"
+msgid "_Previous"
+msgstr "_Föregående"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Frasen hittades inte"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Nästa"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Mat_cha skiftläge"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Föregående"
+msgid "Phrase not found"
+msgstr "Frasen hittades inte"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2633,12 +2563,12 @@ msgstr "Röstsamtal avslutat"
 msgid "Edit Custom Messages"
 msgstr "Redigera anpassade meddelanden"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1044
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Meddelandet redigerat %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1749
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2714,39 +2644,43 @@ msgstr "Certifikatets värdnamn: %s"
 
 # Hm?
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Fortsätt"
+msgid "C_ontinue"
+msgstr "F_ortsätt"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Opålitlig anslutning"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Denna anslutning är inte pålitlig. Vill du fortsätta ändå?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Kom ihåg detta val för framtida anslutningar"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Certifikatinformation"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1738
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Kunde inte öppna uri"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1835
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1907
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Otillräckligt med ledigt utrymme för att spara filen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1915
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "%s ledigt utrymme krävs för att spara denna fil men endast %s finns tillgängligt. Välj en annan plats."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1959
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Inkommande fil från %s"
@@ -2919,31 +2853,31 @@ msgstr "Västlig"
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Inget felmeddelande"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Snabbmeddelanden (Empathy)"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "Anslut inte vid uppstart"
 
-#: ../src/empathy.c:438
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Visa inte kontaktlistan eller några andra dialogrutor vid uppstart"
 
-#: ../src/empathy.c:453
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "- Empathy snabbmeddelandeklient"
 
-#: ../src/empathy.c:640
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "Fel vid anslutning till kontohanteraren"
 
-#: ../src/empathy.c:642
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2966,11 +2900,11 @@ msgstr "Empathy distribueras i hopp om att det ska vara användbart, men UTAN NÃ
 msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr "Du bör ha fått en kopia av GNU General Public License tillsammans med Empathy. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "En snabbmeddelandeklient för GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -2980,194 +2914,73 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Det inträffade ett fel när konton importerades."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Det inträffade ett fel vid tolkning av kontouppgifterna."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Det inträffade ett fel när kontot skapades."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Det inträffade ett fel."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Felmeddelandet var: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "Du kan antingen gå tillbaka och försöka att ange dina kontouppgifter igen eller avsluta denna guide och lägga till konton senare från Redigera-menyn."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Ett fel inträffade"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Vilken typ av chattkonto har du?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Har du ytterligare chattkonton som du vill konfigurera?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Ange dina kontouppgifter"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Vilken typ av chattkonto vill du skapa?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Vill du skapa andra chattkonton?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Ange uppgifterna för det nya kontot"
-
-#: ../src/empathy-account-assistant.c:612
-msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "Med Empathy kan du chatta med anslutna personer i närheten och med vänner och kollegor som använder Google Talk, AIM, Windows Live och många andra chattprogram. Du kan även använda ljud- och videosamtal om du har en mikrofon eller webbkamera."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Har du ett konto som du har använt med andra chattprogram?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Ja, importera mina kontouppgifter från "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Ja, jag vill ange mina kontouppgifter nu"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Nej, jag vill ha ett nytt konto"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Nej, jag vill bara se anslutna personer i närheten just nu"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Välj de konton som du vill importera:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Ja"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Nej, det är allt för stunden"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "Empathy kan automatiskt upptäcka och chatta med personer som är anslutna på samma nätverk som du är. Om du vill använda denna funktion så kontrollera att uppgifterna nedan är korrekta. Du kan enkelt ändra dessa uppgifter senare eller inaktivera denna funktion genom att använda \"Konton\"-dialogrutan"
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Redigera->Konton"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Jag vill _inte aktivera denna funktion just nu"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "Du kommer inte att kunna chatta med personer som är anslutna till ditt lokala nätverk eftersom telepathy-salut inte är installerat. Om du vill aktivera denna funktion så installera paketet telepathy-salut och skapa ett Personer i närheten-konto från Konto-dialogrutan"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut är inte installerat"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Guide för meddelanden och VoIP-konton"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Välkommen till Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importera dina befintliga konton"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Ange personlig information"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:71
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Det finns osparade ändringar för ditt %s-konto."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:75
 msgid "Your new account has not been saved yet."
 msgstr "Ditt nya konto har inte sparats än."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1330
+#: ../src/empathy-accounts-dialog.c:347
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Ansluter..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "Frånkopplad — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Frånkopplad — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "Frånkopplad — Ingen nätverksanslutning"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "Okänd status"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
 msgstr "Frånkopplad — Kontot är inaktiverat"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Du är på väg att skapa ett nytt konto vilket kommer att\n"
-"förkasta dina ändringar. Är du säker att du vill fortsätta?"
+#: ../src/empathy-accounts-dialog.c:533
+msgid "Edit Connection Parameters"
+msgstr "Redigera anslutningsdetaljer"
+
+#: ../src/empathy-accounts-dialog.c:696
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Misslyckades med att hämta din personliga information från servern."
+
+#: ../src/empathy-accounts-dialog.c:702
+msgid "Go online to edit your personal information."
+msgstr "Anslut dig för att redigera din personliga information."
+
+#: ../src/empathy-accounts-dialog.c:787
+msgid "_Edit Connection Parameters..."
+msgstr "_Redigera anslutningsdetaljer..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1283
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vill du ta bort %s från din dator?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1287
 msgid "This will not remove your account on the server."
 msgstr "Detta kommer inte att ta bort ditt konto på servern."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3176,15 +2989,23 @@ msgstr ""
 "förkasta dina ändringar. Är du säker att du vill fortsätta?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "_Aktivera"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "_Inaktivera"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Hoppa över"
+
+#: ../src/empathy-accounts-dialog.c:2087
+msgid "_Connect"
+msgstr "An_slut"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3196,438 +3017,463 @@ msgstr ""
 msgid "Add…"
 msgstr "Lägg till…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Läser in kontoinformation"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Inga protokoll installerade"
+msgid "_Import…"
+msgstr "_Importera…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokoll:"
+msgid "Loading account information"
+msgstr "Läser in kontoinformation"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "To add a new account, you first have to install a backend for each protocol you want to use."
 msgstr "För att lägga till ett nytt konto måste du först installera en bakände för varje protokoll som du vill använda."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importera…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Inga protokollbakänder installerade"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- Autentiseringsklienten Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Autentiseringsklienten Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Personer i närheten"
-
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr "- Ljud/Videoklienten Empathy"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:218
+#: ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Ljud/Videoklienten Empathy"
 
-#: ../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 "Ljusstyrka"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "Volym"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "_Sidopanel"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "Ljudingång"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "Videoingång"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "Knappsats"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "Detaljer"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1939
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Ring med %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2183
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "IP-adressen som den ses av datorn"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2185
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adressen som den ses av en server på Internet"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adressen för klienten som den ses av andra sidan"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2189
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "IP-adressen för en reläserver"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2191
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "IP-adressen för multicast-gruppen"
 
-#: ../src/empathy-streamed-media-window.c:1843
-#: ../src/empathy-streamed-media-window.c:1846
-#: ../src/empathy-streamed-media-window.c:1849
-#: ../src/empathy-streamed-media-window.c:1852
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Okänt"
 
 #. 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 "Ansluten — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2961
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Tekniska detaljer"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2999
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Programvaran hos %s förstår inte något av de ljudformat som stöds av din dator"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:3004
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Programvaran hos %s förstår inte något av de videoformat som stöds av din dator"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:3010
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "Kan inte etablera en anslutning till %s. Någon av er kanske befinner er på ett nätverk som inte tillåter direktanslutningar."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:3016
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "Det inträffade ett fel på nätverket"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:3020
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3100
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "Ljudformaten som krävs för detta samtal är inte installerade på din dator"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3103
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Videoformaten som krävs för detta samtal är inte installerade på din dator"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Någonting oväntat hände i en Telepathy-komponent. <a href=\"%s\">Rapportera detta fel</a> och bifoga loggarna som samlats in från \"Felsök\"-fönstret i Hjälp-menyn."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:3044
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "Det uppstod ett fel i samtalsmotorn"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:3047
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "Slutet på strömmen nåddes"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:3087
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "Kan inte etablera ljudström"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:3097
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "Kan inte etablera videoström"
 
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-preferences.ui.h:2
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Ljud"
+msgid "_Call"
+msgstr "_Ring"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Avkodande kodek:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Inaktivera kamera"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Visa knappsatsen"
+msgid "_Settings"
+msgstr "_Inställningar"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodande kodek:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Visa"
 
 #: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Lägg på"
+#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Hjälp"
 
 #: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Avsluta aktuellt samtal"
+#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "I_nnehåll"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokal kandidat:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Felsökning"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximera mig"
+msgid "Swap camera"
+msgstr "Växla kamera"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimera mig"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Fjärrkandidat:"
+msgid "Maximise me"
+msgstr "Maximera mig"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Skicka ljud"
+msgid "Disable camera"
+msgstr "Inaktivera kamera"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Skicka video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Lägg på"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Visa knappsats"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Avsluta aktuellt samtal"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Videosamtal"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Starta ett videosamtal"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Starta ett röstsamtal"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Växla kamera"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Växla ljudöverföring"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Växla videoöverföring"
+msgid "Show dialpad"
+msgstr "Visa knappsats"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2591
-#: ../src/empathy-call-window.c:2592
-#: ../src/empathy-call-window.c:2593
-#: ../src/empathy-call-window.c:2594
-msgid "Unknown"
-msgstr "Okänt"
+msgid "Display the dialpad"
+msgstr "Visa knappsatsen"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Skicka video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Videosamtal"
+msgid "Toggle video transmission"
+msgstr "Växla videoöverföring"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Ring"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Skicka ljud"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "I_nnehåll"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Växla ljudöverföring"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Felsökning"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kodande kodek:"
+
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2587
+#: ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589
+#: ../src/empathy-call-window.c:2590
+msgid "Unknown"
+msgstr "Okänt"
 
 #: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Hjälp"
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Avkodande kodek:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Fjärrkandidat:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Inställningar"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Lokal kandidat:"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Visa"
+msgid "Audio"
+msgstr "Ljud"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Stäng detta fönster?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Lämna %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Stäng fönstret"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Lämna rummet"
 
-#: ../src/empathy-chat-window.c:481
-#: ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:640
+#: ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d oläst)"
 msgstr[1] "%s (%d olästa)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (och %u annat)"
 msgstr[1] "%s (och %u andra)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d oläst från andra)"
 msgstr[1] "%s (%d olästa från andra)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d oläst från alla)"
 msgstr[1] "%s (%d olästa från alla)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Skickar %d meddelande"
 msgstr[1] "Skickar %d meddelanden"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Skriver ett meddelande."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "T_öm"
+msgid "_Conversation"
+msgstr "_Samtal"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "K_ontakt"
+msgid "C_lear"
+msgstr "T_öm"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Infoga _smilis"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Favoritchattrum"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Bjud in _deltagare…"
+msgid "Notify for All Messages"
+msgstr "Notifiera för alla meddelanden"
 
 #: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Flytta flik till _vänster"
+#: ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Visa kontaktlista"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Flytta flik till _höger"
+msgid "Invite _Participant…"
+msgstr "Bjud in _deltagare…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notifiera för alla meddelanden"
+msgid "C_ontact"
+msgstr "K_ontakt"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Samtal"
+msgid "_Tabs"
+msgstr "_Flikar"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Koppla loss flik"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Favoritchattrum"
+msgid "_Previous Tab"
+msgstr "_Föregående flik"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Nästa flik"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Föregående flik"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "Ån_gra flikstängning"
 
-#: ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Visa kontaktlista"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Flytta flik till _vänster"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Flikar"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Flytta flik till _höger"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "Ån_gra flikstängning"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Koppla loss flik"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3641,106 +3487,106 @@ msgstr "Rum"
 msgid "Auto-Connect"
 msgstr "Anslut automatiskt"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Hantera favoritrum"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "Inkommande videosamtal"
 
-#: ../src/empathy-event-manager.c:521
-#: ../src/empathy-call-window.c:1563
+#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
-#: ../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 ringer ett videosamtal till dig. Vill du svara?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ringer dig. Vill du svara?"
 
-#: ../src/empathy-event-manager.c:529
-#: ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1569
+#: ../src/empathy-event-manager.c:531
+#: ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Inkommande samtal från %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "Avv_isa"
 
-#: ../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 "_Svara"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "S_vara med video"
 
-#: ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1569
+#: ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Inkommande videosamtal från %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "Rumsinbjudan"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Inbjudan till att gå in i %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s bjuder in dig till %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "_Neka"
 
-#: ../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 "_GÃ¥ in"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s har bjudit in dig till %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Du har blivit inbjuden att gå med i %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Inkommande filöverföring från %s"
 
-#: ../src/empathy-event-manager.c:1145
-#: ../src/empathy-main-window.c:378
+#: ../src/empathy-event-manager.c:1147
+#: ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Lösenord krävs"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vill ha behörighet att se när du är ansluten"
 
-#: ../src/empathy-event-manager.c:1214
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3750,108 +3596,108 @@ msgstr ""
 "Meddelande: %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 "Okänt"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s av %s i %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s av %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 "Tar emot \"%s\" från %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 "Skickar \"%s\" till %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 "Fel vid mottagning av \"%s\" från %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Fel vid mottagning av en fil"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Fel vid sändning av \"%s\" till %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Fel vid sändning av en fil"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" togs emot från %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\" skickades till %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Filöverföringen är färdig"
 
-#: ../src/empathy-ft-manager.c:616
-#: ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615
+#: ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Väntar på svar från den andra deltagaren"
 
-#: ../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 "Kontrollerar integritet för \"%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 "Hashar \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Fil"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Återstår"
 
@@ -3863,176 +3709,194 @@ msgstr "Filöverföringar"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Ta bort färdiga, avbrutna och misslyckade filöverföringar från listan"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importera"
+
+#: ../src/empathy-import-dialog.c:88
 msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
 msgstr "Inga konton att importera kunde hittas. Empathy har för närvarande endast stöd för att importera konton från Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importera konton"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importera"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Källa"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Ange lösenord"
 
-#: ../src/empathy-main-window.c:401
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Koppla ifrån"
 
-#: ../src/empathy-main-window.c:642
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Du måste konfigurera ett konto för att se kontakter här."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ingen träff hittades"
 
-#: ../src/empathy-main-window.c:750
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 
-#: ../src/empathy-main-window.c:818
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Uppdatera programvara..."
 
-#: ../src/empathy-main-window.c:824
-#: ../src/empathy-main-window.c:949
+#: ../src/empathy-roster-window.c:855
+#: ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Stäng"
 
-#: ../src/empathy-main-window.c:937
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Anslut igen"
 
-#: ../src/empathy-main-window.c:943
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Redigera konto"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1088
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Fyll på %s (%s)..."
 
-#: ../src/empathy-main-window.c:1135
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Fyll på kontot"
 
 #. top up button
-#: ../src/empathy-main-window.c:1206
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Fyll på..."
 
-#: ../src/empathy-main-window.c:1949
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:2324
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr ""
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktlista"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Kontakter på en ka_rta"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Kontoinställningar"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Saldo"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nytt samtal..."
 
-# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
-# inte ska hittas, döljer gör man för att det inte ska synas.
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Sök i kontakt_lista"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nytt sa_mtal…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "GÃ¥ in i _favoriter"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Sök efter kontakter..."
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Hantera favoriter"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Fi_löverföringar"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormal storlek"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Frånkopplade kontakter"
 
-#: ../src/empathy-main-window-menubar.ui.h:7
-#: ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nytt sa_mtal…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Visa protoko_ll"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normal storlek med _profilbilder"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Saldo"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Kontakter på en ka_rta"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Konton"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Blockerade kontakter"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "I_nställningar"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Visa protoko_ll"
+# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
+# inte ska hittas, döljer gör man för att det inte ska synas.
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Sök i kontakt_lista"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Sortera efter _namn"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Sortera efter _status"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Konton"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normal storlek med _profilbilder"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Blockerade kontakter"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormal storlek"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Kompakt storlek"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Fi_löverföringar"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Rum"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_GÃ¥ in..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nytt samtal..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Frånkopplade kontakter"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personlig information"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Rum"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "GÃ¥ in i _favoriter"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Sök efter kontakter..."
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Hantera favoriter"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4044,7 +3908,7 @@ msgstr "Medlemmar"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4057,479 +3921,480 @@ msgstr ""
 "Lösenord krävs: %s\n"
 "Medlemmar: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nej"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Kunde inte starta rumslistningen"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Kunde inte stoppa rumslistningen"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Kunde inte läsa in rumslistan"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "GÃ¥ in i rum"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "Ange rumsnamnet för att gå in i eller klicka på ett eller flera rum i listan."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Rum:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
 msgstr "Ange servern som tillhandahåller rummet, eller lämna den tom om rummet finns på servern för det aktuella kontot"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "GÃ¥ in i rum"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Kunde inte läsa in rumslistan"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Rumslista"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Rum:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Meddelande togs emot"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Meddelandet skickat"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Nytt samtal"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Kontakt ansluter"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Kontakt kopplar från"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Kontot anslutet"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Kontot frånkopplat"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Språk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Romeo, min Romeo, var är du Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Förneka din fader och vägra ditt namn;"
 
 #. 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 "Eller om du icke, men var svurit min kärlek"
 
 #. 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 "Och jag kommer inte längre att vara en Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Skall jag höra mer, eller ska jag tala?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julia har kopplat från"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Inställningar"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Visa _smilisar som bilder"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Visa kontakt_lista i rum"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Utseende"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Beteende"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Starta chattar i:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Chatt_ema:"
+msgid "new ta_bs"
+msgstr "nya fl_ikar"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Inaktivera notifieringar under fr_Ã¥nvaro eller upptagen"
+msgid "new _windows"
+msgstr "nya _fönster"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Inaktivera ljud under fr_Ã¥nvaro eller upptagen"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Visa inkommande händelser i notifieringsytan"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "Anslut _automatiskt vid uppstart"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
-msgstr "Ekosläckning hjälper till att göra din röst klarare för den andra personen, men kan orsaka problem på vissa datorer. Om du eller den andra personen hör konstiga oljud eller avbrott under samtal, prova att stänga av ekosläckning och börja om samtalet."
+msgid "Log conversations"
+msgstr "Logga samtal"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Aktivera notifieringar när en kontakt ansluter"
+msgid "Behavior"
+msgstr "Beteende"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Aktivera notifieringar när en kontakt kopplar från"
+msgid "General"
+msgstr "Allmänt"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Aktivera notifieringar när _chatten inte är fokuserad"
+msgid "_Enable bubble notifications"
+msgstr "_Aktivera bubbelnotifieringar"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Aktivera rättstavning för språk:"
+msgid "Disable notifications when _away or busy"
+msgstr "Inaktivera notifieringar under fr_Ã¥nvaro eller upptagen"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Allmänt"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Aktivera notifieringar när _chatten inte är fokuserad"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Ingångsnivå:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Aktivera notifieringar när en kontakt ansluter"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Ingångsvolym:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Aktivera notifieringar när en kontakt kopplar från"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Notifieringar"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Platskällor:"
+msgid "_Enable sound notifications"
+msgstr "_Aktivera ljudnotifieringar"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Logga samtal"
+msgid "Disable sounds when _away or busy"
+msgstr "Inaktivera ljud under fr_Ã¥nvaro eller upptagen"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Notifieringar"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Spela upp ljud för händelser"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Ljud"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Integritet"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Använd _ekosläckning för att förbättra samtalskvaliteten"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
-msgstr "Minskad precision för platsen betyder att ingenting mer informativt än din stad, län och land kommer att publiceras. GPS-koordinater kommer endast att använda en decimal."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Visa _smilisar som bilder"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Visa kontakt_lista i rum"
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Ekosläckning hjälper till att göra din röst klarare för den andra personen, men kan orsaka problem på vissa datorer. Om du eller den andra personen hör konstiga oljud eller avbrott under samtal, prova att stänga av ekosläckning och börja om samtalet."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Ljud"
+msgid "_Publish location to my contacts"
+msgstr "_Publicera platsen till mina kontakter"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Stavningskontroll"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr "Listan visar endast språk som du har en ordlista installerad för."
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
+msgstr "Minskad precision för platsen betyder att ingenting mer informativt än din stad, län och land kommer att publiceras. GPS-koordinater kommer endast att använda en decimal."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Teman"
+msgid "_Reduce location accuracy"
+msgstr "_Minska precision för plats"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr ""
+msgid "Privacy"
+msgstr "Integritet"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "Variant:"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "Anslut _automatiskt vid uppstart"
-
-#: ../src/empathy-preferences.ui.h:33
 msgid "_Cellphone"
 msgstr "_Mobiltelefon"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "_Aktivera bubbelnotifieringar"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Nätverk (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "_Aktivera ljudnotifieringar"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Platskällor:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "Listan visar endast språk som du har en ordlista installerad för."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Nätverk (IP, Wi-Fi)"
+msgid "Enable spell checking for languages:"
+msgstr "Aktivera rättstavning för språk:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "_Öppna nya chattar i separata fönster"
+msgid "Spell Checking"
+msgstr "Stavningskontroll"
 
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "_Publicera platsen till mina kontakter"
+msgid "Chat Th_eme:"
+msgstr "Chatt_ema:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variant:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:41
-msgid "_Reduce location accuracy"
-msgstr "_Minska precision för plats"
+msgid "Themes"
+msgstr "Teman"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Status"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Ring upp kontakten igen"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera av"
+msgid "Redial"
+msgstr "Ring igen"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera på"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video av"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Inaktivera kamera och stoppa videoöverföringen"
+msgid "Video Preview"
+msgstr "Videoförhandsvisning"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Aktivera kamera och överför video"
+msgid "Video On"
+msgstr "Video på"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Aktivera kameran med överför ingen video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Ring upp kontakten igen"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Förhandsvisning"
+msgid "Camera Off"
+msgstr "Kamera av"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ring igen"
+msgid "Disable camera and stop sending video"
+msgstr "Inaktivera kamera och stoppa videoöverföringen"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Förhandsvisning"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video av"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Aktivera kameran med överför ingen video"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video på"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera på"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videoförhandsvisning"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Aktivera kamera och överför video"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Kartvy för kontakter"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1585
 msgid "Save"
 msgstr "Spara"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1761
 msgid "Debug Window"
 msgstr "Felsökningsfönster"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1848
 msgid "Pause"
 msgstr "Gör paus"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:1860
 msgid "Level "
 msgstr "Nivå "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1879
 msgid "Debug"
 msgstr "Felsökning"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1884
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1561
-#: ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:1889
+#: ../src/empathy-debug-window.c:1935
 msgid "Message"
 msgstr "Meddelande"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1894
 msgid "Warning"
 msgstr "Varning"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:1899
 msgid "Critical"
 msgstr "Kritiskt"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:1904
 msgid "Error"
 msgstr "Fel"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:1923
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1926
 msgid "Domain"
 msgstr "Domän"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:1928
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:1930
 msgid "Level"
 msgstr "Nivå"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:1953
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfelsökning."
 
-#: ../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 "Bjud in deltagare"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Välj en kontakt att bjuda in till samtalet:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Bjud in"
 
-#: ../src/empathy-accounts.c:184
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Visa inte några dialogrutor; gör valfri åtgärd (t.ex, importera) och avsluta"
 
-#: ../src/empathy-accounts.c:188
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "Visa inte några dialogrutor såvida inte det endast finns \"Personer i närheten\"-konton"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Välj initiallt angivet konto (t.ex., gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:194
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:197
-msgid "Show account assistant"
-msgstr "Visa kontoguiden"
-
-#: ../src/empathy-accounts.c:203
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy-konton"
 
-#: ../src/empathy-accounts.c:242
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-konton"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Visa en specifik tjänst"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empathy-felsökare"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy-felsökare"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy chattklient"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "Svara"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1573
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Avvisa"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1574
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "Svara"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
 msgid "Answer with video"
 msgstr "Svara med video"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr "Neka"
 
-#: ../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 "Acceptera"
 
 #. 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 "Tillhandahåll"
 
@@ -4540,33 +4405,286 @@ msgstr "%s försökte just ringa dig men du var upptagen i ett annat samtal."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1183
-#: ../src/empathy-call-window.c:1206
+#: ../src/empathy-call-window.c:1179
+#: ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2890
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "Väntar"
 
-#: ../src/empathy-call-window.c:2893
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Tyst"
 
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Längd"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2898
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3214
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Ditt aktuella saldo är %s."
+
+#: ../src/empathy-call-window.c:3218
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr ""
+
+#: ../src/empathy-call-window.c:3220
+msgid "Top Up"
+msgstr "Fyll på"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Matcha skiftläge"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Vilken typ av chattkonto har du?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Lägger till nytt konto"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Personer i närheten"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
+msgstr "Empathy kan automatiskt upptäcka och chatta med personer som är anslutna på samma nätverk som du är. Om du vill använda denna funktion så kontrollera att uppgifterna nedan är korrekta."
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+
+#~ msgid "Personal Information"
+#~ msgstr "Personlig information"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Länkade kontakter"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Välj kontakter att länka"
+
+#~ msgid "New contact preview"
+#~ msgstr "Förhandsvisa ny kontakt"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Kontakter markerade i listan till vänster kommer att länkas ihop."
+#~ msgctxt "Link individual (contextual menu)"
+
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Länka kontakter..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "Länka kontakter"
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink…"
+#~ msgstr "A_vlänka..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Dela helt upp den visade länkade kontakten till separata kontakter."
+
+#~ msgid "_Link"
+#~ msgstr "_Länka"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Avlänka länkade kontakter \"%s\"?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Är du säker på att du vill avlänka dessa länkade kontakter? Detta kommer "
+#~ "helt att dela upp de länkade kontakterna till separata kontakter."
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink"
+#~ msgstr "Av_länka"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Det inträffade ett fel när konton importerades."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Det inträffade ett fel vid tolkning av kontouppgifterna."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Det inträffade ett fel när kontot skapades."
+
+#~ msgid "There was an error."
+#~ msgstr "Det inträffade ett fel."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Felmeddelandet var: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Du kan antingen gå tillbaka och försöka att ange dina kontouppgifter igen "
+#~ "eller avsluta denna guide och lägga till konton senare från Redigera-"
+#~ "menyn."
+
+#~ msgid "An error occurred"
+#~ msgstr "Ett fel inträffade"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Har du ytterligare chattkonton som du vill konfigurera?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Ange dina kontouppgifter"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Vilken typ av chattkonto vill du skapa?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Vill du skapa andra chattkonton?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Ange uppgifterna för det nya kontot"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Med Empathy kan du chatta med anslutna personer i närheten och med vänner "
+#~ "och kollegor som använder Google Talk, AIM, Windows Live och många andra "
+#~ "chattprogram. Du kan även använda ljud- och videosamtal om du har en "
+#~ "mikrofon eller webbkamera."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Har du ett konto som du har använt med andra chattprogram?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Ja, importera mina kontouppgifter från "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Ja, jag vill ange mina kontouppgifter nu"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Nej, jag vill ha ett nytt konto"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Nej, jag vill bara se anslutna personer i närheten just nu"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Välj de konton som du vill importera:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Nej, det är allt för stunden"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Redigera->Konton"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Jag vill _inte aktivera denna funktion just nu"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Du kommer inte att kunna chatta med personer som är anslutna till ditt "
+#~ "lokala nätverk eftersom telepathy-salut inte är installerat. Om du vill "
+#~ "aktivera denna funktion så installera paketet telepathy-salut och skapa "
+#~ "ett Personer i närheten-konto från Konto-dialogrutan"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Guide för meddelanden och VoIP-konton"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Välkommen till Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importera dina befintliga konton"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Ange personlig information"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokoll:"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Personlig information"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Öppna nya chattar i separata fönster"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Visa kontoguiden"
+
+#~ msgid "Call volume"
+#~ msgstr "Samtalsvolym"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Samtalsvolym, som en procentandel."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Uttagstypen stöds inte"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Mina webbkonton"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Kontot %s redigeras via %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Kontot %s kan inte redigeras i Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Starta Mina webbkonton"
+
+#~ msgid "Edit %s"
+#~ msgstr "Redigera %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "Av_bryt"
+#~ msgctxt "Edit contact (contextual menu)"
+
+#~ msgid "_Edit"
+#~ msgstr "R_edigera"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Kontakt-id:"
+
+#~ msgid "C_hat"
+#~ msgstr "C_hatta"
+
+#~ msgid "Send _Video"
+#~ msgstr "Skicka _video"
+
+#~ msgid "C_all"
+#~ msgstr "Rin_g"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Ange din närvaro och aktuell status"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Du är på väg att skapa ett nytt konto vilket kommer att\n"
+#~ "förkasta dina ändringar. Är du säker att du vill fortsätta?"
+
+#~ msgid "Input level:"
+#~ msgstr "Ingångsnivå:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Ingångsvolym:"
+
 #~ msgid "Ungrouped"
 #~ msgstr "Ogrupperade"
 
@@ -5250,9 +5368,6 @@ msgstr "_Matcha skiftläge"
 #~ msgid "gtk-quit"
 #~ msgstr "Avsluta"
 
-#~ msgid "ICQ account settings"
-#~ msgstr "Inställningar för ICQ-konto"
-
 #~ msgid "jabber account settings"
 #~ msgstr "inställningar för jabberkonto"
 
@@ -5335,8 +5450,6 @@ msgstr "_Matcha skiftläge"
 #~ msgstr "Snabbmeddelandeklient för Gnome"
 #~ msgid "-"
 #~ msgstr "-"
-#~ msgid "<b>Personal Details</b>"
-#~ msgstr "<b>Personliga detaljer</b>"
 #~ msgid "<b>Status</b>"
 #~ msgstr "<b>Status</b>"
 #~ msgid "<b>Subscription</b>"
@@ -5421,8 +5534,6 @@ msgstr "_Matcha skiftläge"
 #~ msgstr "Använd systemets pro_xyinställningar"
 #~ msgid "_Birthday:"
 #~ msgstr "_Födelsedag:"
-#~ msgid "_Connect"
-#~ msgstr "An_slut"
 #~ msgid "_Deny"
 #~ msgstr "_Neka"
 #~ msgid "_Disconnect"
@@ -5614,8 +5725,6 @@ msgstr "_Matcha skiftläge"
 #~ msgstr "Ett okänt fel inträffade under filöverföringen."
 #~ msgid "Someone would like to send you a file."
 #~ msgstr "NÃ¥gon vill skicka en fil till dig."
-#~ msgid "Retry connection"
-#~ msgstr "Ã…teranslut"
 #~ msgid "Invited %s to join this chat conference."
 #~ msgstr "Inbjöd %s till att gå med i chattkonferens."
 #~ msgid "%s has set the topic: %s"
@@ -5735,8 +5844,6 @@ msgstr "_Matcha skiftläge"
 #~ "information."
 #~ msgid "Account Name"
 #~ msgstr "Kontonamn"
-#~ msgid "Connection Details"
-#~ msgstr "Anslutningsdetaljer"
 #~ msgid "Enter the port used in the connection for this account"
 #~ msgstr "Ange porten att ansluta till för detta konto"
 #~ msgid "Enter the server used in the connection for this account"
@@ -5934,8 +6041,6 @@ msgstr "_Matcha skiftläge"
 #~ msgstr "<b>Utseende och beteende</b>"
 #~ msgid "Check spelling while I _type"
 #~ msgstr "Kontrollera stavning medan jag skriver"
-#~ msgid "Close this chat window"
-#~ msgstr "Stäng detta chattfönster"
 #~ msgid "Requested Information"
 #~ msgstr "Information efterfrågad"
 #~ msgid "Requested information."
@@ -6070,9 +6175,6 @@ msgstr "_Matcha skiftläge"
 #~ "<b>Söker efter den bästa servern...</b>\n"
 #~ "Detta kommer att ta en stund, var god vänta."
 
-#~ msgid "Add Another Account"
-#~ msgstr "Lägg till ytterligare konto"
-
 #~ msgid "Configuring Service"
 #~ msgstr "Konfigurerar tjänst"
 
diff --git a/po/te.po b/po/te.po
index 9516ee0b2..19464cb48 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,29 +1,29 @@
 # translation of empathy.master.te.po to Telugu
-# Copyright (C) 2011 Gnome Contributors
+# Copyright (C) 2012 Swecha localisation Team
 # This file is distributed under the same license as the empathy package.
 #
 #
 # Krishna Babu K <kkrothap@redhat.com>, 2009.
 # Praveen Illa <mail2ipn@gmail.com>, 2011.
 # Krishnababu Krothapalli <kkrothap@redhat.com>, 2011.
+# Sasi Bhushan Boddepalli <Sasi@swecha.net>,2011
+# GVS.Giri <gvs.giri947@gmail.com>,2012.
+# Sasi Bhushan Boddepalli <Sasi@swecha.net>,2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master.te\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-06-15 10:09+0000\n"
-"PO-Revision-Date: 2011-06-15 20:28+0530\n"
-"Last-Translator: Krishnababu Krothapalli <kkrothap@redhat.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-10-09 06:09+0000\n"
+"PO-Revision-Date: 2012-01-31 19:11+0530\n"
+"Last-Translator:Praveen Illa <mail2ipn@gmail.com>\n"
 "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"\n"
-"\n"
-"\n"
-"\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "Language: te\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -47,429 +47,438 @@ msgid "Always open a separate chat window for new chats."
 msgstr "కొత�త చాట�‌లక� ఎల�లప�ప�డ� ఒక వేరే కొత�త చాట� విండోన� తెర�వ�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "కాల� ఘణపరిమాణమ�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "కాల� ఘణపరిమాణమ�, ఒక శాతమ�గా"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "కెమెరా పరికరం"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "కెమెరా స�థానమ�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"గ�ంప� చాట� నంద� నిక� కంప�లీషన� (ట�యాబ�) ఉపయోగిస�త�న�నప�ప�డ� మార�పేర� తర�వాత "
-"జతచేయవలసిన అక�షరమ�."
+"గ�ంప� చాట� నంద� నిక� కంప�లీషన� (ట�యాబ�) ఉపయోగిస�త�న�నప�ప�డ� మార�పేర� తర�వాత జతచేయవలసిన అక�షరమ�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "చాట� విండో థీమ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#, fuzzy
-#| msgid "Chat window theme"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
-msgstr "చాట� విండో థీమ�"
+msgstr "మాట�లాడ�కొన� కిటికీ (చాట� విండో) థీం మార�ప�ల�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"ఉపయోగించ�టక� కామాతో వేర�చేయబడివ�న�న అక�షరక�రమం తనిఖీచేయ� భాషల యొక�క జాబితా (ఉ."
-"దా. en, fr, nl)."
+"ఉపయోగించ�టక� కామాతో వేర�చేయబడివ�న�న అక�షరక�రమం తనిఖీచేయ� భాషల యొక�క జాబితా (ఉ.దా. en, fr, nl)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "కాంపాక�ట� పరిచయ జాబితా"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "అన�సంధాన నిర�వాహకాలన� తప�పక ఉపయోగించాలి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "పరిచయ జాబితా క�రమబద�దీకరణ విధానమ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "వీడియో కాల�స� లో ఉపయోగించడానికి అప�రమేయ కెమెరా పరికరం"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "అవతార బొమ�మన� ఎంచ�కొన�టక� అప�రమేయ డైరెక�టరీ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "దూరంగా ఉన�నప�ప�డ� పాప�అప� ప�రకటనలన� అచేతనమ�చేయి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "దూరంగా ఉన�నప�ప�డ� శబ�దమ�లన� అచేతనమ� చేయి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "లోనికివచ�చ� ఘటనలన� స�థితి ప�రాంతమ�లో చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr ""
-"లోనికివచ�చ� ఘటనలన� స�థితి ప�రదేశమ�లో చూపించ�. ఒకవేళ తప�పయినట�లయితే, వాడ�కరికి "
-"సత�వరమే చూపించ�."
+"లోనికివచ�చ� ఘటనలన� స�థితి ప�రదేశమ�లో చూపించ�. ఒకవేళ తప�పయినట�లయితే, వాడ�కరికి సత�వరమే చూపించ�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "అతి ధ�వన�లన� నిర�మూలించడానికి సహకారం"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "ఎంపతి వాడ�కరి యొక�క స�థానమ�న� ప�రచ�రించగలద�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "స�థానమ�న� అంచనావేయ�టక� ఎంపతి GPSన� ఉపయోగించగలద�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "స�థానమ�న� అంచనా వేయ�టక� ఎంపతి సెల�య�లర� నెట�‌వర�క�న� ఉపయోగించగలద�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "స�థానమ�న� అంచానావేయ�టక� ఎంపతి నెట�‌వర�క�న� ఉపయోగించగలద�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "ఎంపతి అప�రమేయ డౌన�‌లోడ� సంచయం"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
-msgstr ""
+msgstr "అభివృధ�ధి చెందిన సీతాకోక చిల�క లాగ� ల� ఎంపతి కలిగి వ�న�నది"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "ఎంపతి వాడ�కలో లేనప�డ� దూరంగా ఉన�నట�ట� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "ప�రారంభమ�లో ఎంపతి స�వయంగా-అన�సంధానించబడాలి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "స�థానమ� యొక�క ఖచ�చితత�వమ�న� ఎంపతి తప�పక తగ�గించవలెన�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "ఎంపతి పరిచయం యొక�క అవతారమ�న� చాట� విండో ప�రతీక వలె ఉపయోగించాలి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "వెబ�‌కిట� అభివృద�ధికార�ని సాధనమ�లన� చేతనపర�చ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "కొత�త సందేశమ�ల� కొరక� పాప�అప� ప�రకటనలన� చేతనపర�చ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "అక�షరక�రమం తనిఖీచేయ�దానిని చేతనపర�చ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "ప�రధాన విండోన� దాయి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "ప�రధాన విండోన� దాయి."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "మార�పేర�న� పూర�తిచేయ� అక�షరమ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "కొత�త చాట�‌లన� వేర�వేర� విండోలలో తెర�వ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "ఉపయోగించ�టక� అడియమ� థీమ� యొక�క పాత�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"ఒకవేళ చాట�‌నక� ఉపయోగించిన థీమ� అడియమ� అయితే అడియమ� థీమ� వాడటానికి అవసరమగ� "
-"పాత�."
+msgstr "ఒకవేళ చాట�‌నక� ఉపయోగించిన థీమ� అడియమ� అయితే అడియమ� థీమ� వాడటానికి అవసరమగ� పాత�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "లోనికివచ�చ� సందేశమ�లక� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "కొత�త సంభాషణలక� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "బయటక�పోవ� సందేశమ�లక� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "పరిచయం ప�రవేశించినప�డ� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "పరిచయం నిష�క�రమించినప�డ� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "మనమ� ప�రవేశించినప�డ� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "మనమ� నిష�క�రమించినప�డ� శబ�దమ�న� వినిపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "చాట� పై దృష�టి సారించకపోతే ప�రకటనలన� పైన చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "పరిచయం లాగిన� అయినప�ప�డ� ప�రకటనల� పైన చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "పరిచయం నిష�క�రమించినప�డ� ప�రకటనలన� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "కెమెరా ఉపదర�శన స�థానమ� ఖచ�చితంగా కాల� మధ�యలో  ఉండవలెన�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "పరిచయ జాబితాలో సమత�ల�యతన� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "అవతారమ�లన� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "గద�లలో పరిచయ జాబితాన� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "ప�రధాన విండోన� మూసివేయ�టక� సూచనన� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "ఆఫ�‌లైన� పరిచయాలన� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "ప�రోటోకాల�స�న� చూపించ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "అక�షరక�రమ తనిఖీచేయ� భాషల�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "ఫైళ�ళ బదిలీకరణలన� వ�యవస�థలో భద�రపర�చ�టక� అప�రమేయ సంచయం."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "అవతారమ� బొమ�మన� ఎంచ�కోబడినట�వంటి ఆఖరి డైరెక�టరి."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "చాట� విండో స�థానమ� పక�కపట�టీ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
+msgstr "మటామంతీ(చాట�) కిటికీ ప�రక�కన పలక నిల�వ స�థానమ�(పిక�సెల� లలో)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "చాట� విండోలలోసంభాషణన� ప�రదర�శించ�టక� ఉపయోగించబడిన థీమ�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-#, fuzzy
-#| msgid "The theme that is used to display the conversation in chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
-msgstr "చాట� విండోలలోసంభాషణన� ప�రదర�శించ�టక� ఉపయోగించబడిన థీమ�."
+msgstr "చాట� విండోలలోసంభాషణన� ప�రదర�శించ�టక� మార�ప�ల� చేయగలిగిన థీమ�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "గ�రాఫికల� చిర�నవ�వ�లన� వాడ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "ప�రకటిత శబ�దమ�లన� వాడ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "చాట� గద�ల కొరక� థీమ�న� వాడ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "వాడ�కరి ఉన�న స�థానమ�న� వారి పరిచయమ�లక� ఎంపతి ప�రచ�రించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "స�థానమ�న� అంచనావేయ�టక� ఎంపతి GPSన� ఉపయోగించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "స�థానమ�న� అంచనావేయ�టక� ఎంపతి సెల�య�లర� నెట�‌వర�క�న� ఉపయోగించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "స�థానమ�న� అంచనావేయ�టక� ఎంపతి నెట�‌వర�క�న� ఉపయోగించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
-msgstr ""
+msgstr "అభివృధ�ధి చెందిన సీతాకోక చిల�క లాగ� ల� ఎంపతి కలిగి వ�న�నది"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"ఎంపతి వ�యవస�థ ప�రారంభమ�లో మీ ఖాతాలలోనికి స�వయంచాలకంగా ప�రవేశించాలా వద�దా."
+msgstr "ఎంపతి వ�యవస�థ ప�రారంభమ�లో మీ ఖాతాలలోనికి స�వయంచాలకంగా ప�రవేశించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"ఒకవేళ వాడ�కరి వాడక�ండా ఉంటే ఎంపతిని స�వయంచాలకంగా దూరంగా ఉన�న విధమ�లోనికి "
-"మార�చాలా వద�దా."
+msgstr "ఒకవేళ వాడ�కరి వాడక�ండా ఉంటే ఎంపతిని స�వయంచాలకంగా దూరంగా ఉన�న విధమ�లోనికి మార�చాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"గోప�యతా కారణాల దృష�ట�యా స�థానమ� యొక�క ఖచ�చితత�వాన�ని ఎంపతి తగ�గించాలా వద�దా."
+msgstr "గోప�యతా కారణాల దృష�ట�యా స�థానమ� యొక�క ఖచ�చితత�వాన�ని ఎంపతి తగ�గించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "ఎంపతి పరిచయమ� యొక�క అవతారమ�న� చాట� విండో ప�రతీక వలె ఉపయోగించాలా లేదా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "వెబ� ఇన�‌స�పెక�టర� వంటి వెబ�‌కిట� డెవలపర� సాధనమ�ల� చేతనమ� చేయవలెనా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
-"స�వయంచాలకంగా అనన�సంధానించ�టక�/మళ�ళీ అన�సంధానించ�టక� అన�సంధాన నిర�వాహకాలన� "
-"ఉపయోగించాలా వద�దా."
+"స�వయంచాలకంగా అనన�సంధానించ�టక�/మళ�ళీ అన�సంధానించ�టక� అన�సంధాన నిర�వాహకాలన� ఉపయోగించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
-msgstr ""
-"మీర� పరిశీలించాలన�క�న�న భాషలక� ప�రవేశపెట�టిన పదమ�లన� పరిశీలించాలా వద�దా."
+msgstr "మీర� పరిశీలించాలన�క�న�న భాషలక� ప�రవేశపెట�టిన పదమ�లన� పరిశీలించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "సంభాషణలలో చిర�నవ�వ�లన� గ�రాఫికల� బొమ�మలలోనికి మార�చాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "నాడీధ�వన�లన� క�రియాశీల పర�చ�టక�, అతి ధ�వన�ల నిర�పయోగ పర�చ� ఫిల�టర�"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr ""
-"నెట�‌వర�క�లో ప�రవేశించినప�డ� పరిచయమ�లక� సూచించ�టక� శబ�దమ� వినిపించాలా వద�దా."
+msgstr "నెట�‌వర�క�లో ప�రవేశించినప�డ� పరిచయమ�లక� సూచించ�టక� శబ�దమ� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"నెట�‌వర�క� న�ండి నిష�క�రమించినప�డ� పరిచయమ�లక� శబ�ధమ�న� వినిపించాలా వద�దా."
+msgstr "నెట�‌వర�క� న�ండి నిష�క�రమించినప�డ� పరిచయమ�లక� శబ�ధమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "ఘటనలన� తెలియజేయ�టక� శబ�దమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "లోనికివచ�చ� సందేశమ�లన� తెలియజేయ�టక� శబ�దమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "కొత�త సంభాషణలన� తెలియచేయ�టక� శబ�ధమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "బయటక�వెళ�ళ� సందేశమ�లన� తెలియచేయ�టక� శబ�దమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "నెట�‌వర�క�నంద� ప�రవేశించినప�డ� శబ�దమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "నెట�‌వర�క� న�ండి నిష�క�రమించ�నప�డ� శబ�దమ�న� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "దూరంగావ�న�నప�ప�డ� లేదా తీరికలేనప�డ� శబ�ద ప�రకటనలన� వినిపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ఒక పరిచయం ఆఫ�‌లైన�‌క� వెళ�ళినప�ప�డ� పైకివచ�చ� ప�రకటనన� చూపాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ఒక పరిచయం ఆన�‌లైన�‌క� వచ�చినప�ప�డ� పైకివచ�చ� ప�రకటన చూపాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr ""
-"ఒకవేళ చాట� ఇదివరకే తెరిచివ�ండి, దృష�టి సారించకపోతే, ఒక కొత�త సందేశమ� "
-"వచ�చినప�ప�డ� పైకివచ�చ� ప�రకటనన� "
+"ఒకవేళ చాట� ఇదివరకే తెరిచివ�ండి, దృష�టి సారించకపోతే, ఒక కొత�త సందేశమ� వచ�చినప�ప�డ� పైకివచ�చ� ప�రకటనన� "
 "చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ఒక కొత�త సందేశమ� వచ�చినప�ప�డ� పైకివచ�చ� ప�రకటనని చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "పరిచయ జాబితానంద� ఖాతా సమత�ల�యతన� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"చాట� విండోల� మరియ� పరిచయ జాబితాలలో పరిచయమ�ల కోసం అవతారమ�లన� చూపించాలా వద�దా."
+msgstr "చాట� విండోల� మరియ� పరిచయ జాబితాలలో పరిచయమ�ల కోసం అవతారమ�లన� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "పరిచయ జాబితా నంద� ఆఫ�‌లైన�లో ఉన�న పరిచయాలన� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "దూరంగా లేదా తీరికలేనప�డ� పైకివచ�చ� ప�రకటనలన� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "పరిచయ జాబితాలో పరిచయమ�ల కొరక� ప�రోటోకాల�స�న� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "చాట� గద�లలో పరిచయ జాబితాన� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "పరిచయ జాబితాన� కాంపాక�ట� విధమ�లో చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
-msgstr ""
-"ప�రధాన విండోన� శీర�షిక పట�టీనంద� 'x' బటన�‌తో మూసివేయ�నప�డ� సందేశప� డైలాగ� "
-"చూపించాలా వద�దా."
+msgstr "ప�రధాన విండోన� శీర�షిక పట�టీనంద� 'x' బటన�‌తో మూసివేయ�నప�డ� సందేశప� డైలాగ� చూపించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "చాట� గద�ల కొరక� థీమ�న� ఉపయోగించాలా వద�దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
 "the contact list by state."
 msgstr ""
-"పరిచయ జాబితాన� క�రమబద�దీకరిస�త�న�నప�ప�డ� � విధానాన�ని ఉపయోగించాలి. పరిచయాల "
-"పేర�న� \"name\" విల�వతో "
-"ఉపయోగించి క�రమబద�దీకరించ�ట అప�రమేయం. విల�వ \"state\" అన�నది పరిచయ జాబితాన� "
-"స�థితిని బట�టి "
+"పరిచయ జాబితాన� క�రమబద�దీకరిస�త�న�నప�ప�డ� � విధానాన�ని ఉపయోగించాలి. పరిచయాల పేర�న� \"name\" విల�వతో "
+"ఉపయోగించి క�రమబద�దీకరించ�ట అప�రమేయం. విల�వ \"state\" అన�నది పరిచయ జాబితాన� స�థితిని బట�టి "
 "క�రమబద�దీకరిస�త�ంది."
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
@@ -486,35 +495,31 @@ msgstr "సందేశకమ� మరియ� VoIP ఖాతాల�"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ఫైల� బదిలీ పూర�తయినది, కాని ఫైల� పాడైనది"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "ఫైల� బదిలీ దూరస�థ పరిచయం ద�వారా సహకరించబడ�టలేద�"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "ఎంచ�క�న�న ఫైల� సాధారణ ఫైల� కాద�"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "ఎంచ�క�న�న ఫైల� ఖాళీది"
 
-#: ../libempathy/empathy-message.c:342 ../src/empathy-call-observer.c:130
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
 #, c-format
 msgid "Missed call from %s"
 msgstr "%s న�ండి మిస�స�డ� కాల� వచ�చింది"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:346
-#, fuzzy, c-format
-#| msgid "Call with %s"
+#: ../libempathy/empathy-message.c:419
 msgid "Called %s"
-msgstr "%sతో కాల� చేయి"
+msgstr "%s పిలవబడినది"
 
-#: ../libempathy/empathy-message.c:349
-#, fuzzy, c-format
-#| msgid "Missed call from %s"
+#: ../libempathy/empathy-message.c:422
 msgid "Call from %s"
-msgstr "%s న�ండి మిస�స�డ� కాల� వచ�చింది"
+msgstr "%s న�పిల�వ�మ�"
 
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
@@ -544,162 +549,161 @@ msgstr "ఫైలà±�à°¨à±� బదిలీచేయà±�à°Ÿà°•à±� à°ªà±�రయతà
 msgid "The other participant is unable to transfer the file"
 msgstr "పాల�గొన�న ఇతర�ల� ఫైల� బదిలీచేయలేకపోత�న�నార�"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "తెలియని కారణం"
 
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "అంద�బాట�లోవ�న�నాన�"
 
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "తీరికలేద�"
 
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "దూరంగా ఉన�నాన�"
 
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "అదృశ�యమ�గా ఉన�నాన�"
 
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "ఆఫ�‌లైన�లో ఉన�నాన�"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:258
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "తెలియద�"
 
-#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "� కారణమ� తెల�పలేద�"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "స�థితి ఆఫ�‌లైన�‌క� అమర�చబడింది."
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:335
-#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "నెట�‌వర�క� దోషమ�"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "ప�రామాణీకరణ విఫలమైంది"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "ఎన�‌క�రిప�షన� దోషమ�"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "పేర� వాడ�కలో ఉంది"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "ధృవీకరణపత�రం సమకూర�చబడలేద�"
 
-#: ../libempathy/empathy-utils.c:311 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "ధృవీకరణపత�రం నమ�మలేనిది"
 
-#: ../libempathy/empathy-utils.c:313 ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "ధృవీకరణపత�రం గడ�వ� మ�గిసినది"
 
-#: ../libempathy/empathy-utils.c:315 ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "ధృవీకరణపత�రాన�ని ఉత�తేజపరచలేద�"
 
-#: ../libempathy/empathy-utils.c:317 ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "ధృవీకరణపత�ర అతిథ�యపేర�తో సరిపోలడంలేద�"
 
-#: ../libempathy/empathy-utils.c:319 ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "ధృవీకరణపత�రం వేలిమ�ద�ర సరిపోలడంలేద�"
 
-#: ../libempathy/empathy-utils.c:321 ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "ధృవీకరణపత�రం స�వంతగా-సంతకం చేసినది"
 
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "ధృవీకరణపత�ర దోషమ�"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "ఎన�‌క�రిప�షన� అంద�బాట�లో లేద�"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "ధృవీకరణపత�రం చెల�లనిది"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "అన�సంధానమ� తిరస�కరించబడింది"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "అన�సంధానమ�న� స�థాపించలేకపోయింది"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "అన�సంధానమ�న� కోల�పోయింది"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "ఈ వనర� ఇంతక�మ�ందే సేవకానికి అన�సంధానించబడింది"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
-msgstr ""
-"అన�సంధానమ� అదే వనర�ని ఉపయోగించ�క�ని ఒక కొత�త అన�సంధానమ�చే ప�నఃస�థాపించబడింది"
+msgstr "అన�సంధానమ� అదే వనర�ని ఉపయోగించ�క�ని ఒక కొత�త అన�సంధానమ�చే ప�నఃస�థాపించబడింది"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "సేవకమ�లో ఈ ఖాతా ఇదివరకే ఉన�నది"
 
-#: ../libempathy/empathy-utils.c:374
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "అన�సంధానమ�న� నిర�వహించ�టక� సేవకానికి ప�రస�త�తమ� తీరికలేద�"
 
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "దృవీకరణపత�రం తొలగించబడింది"
 
-#: ../libempathy/empathy-utils.c:378
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
-"స�రక�షితమ�కాని సైఫర� అల�గారిథమ� లేదా క�రిప�టోగ�రాఫికల�లీ బలహీనమైన "
-"ధృవీకరణపత�రాన�ని వాడ�త�ంది"
+msgstr "స�రక�షితమ�కాని సైఫర� అల�గారిథమ� లేదా క�రిప�టోగ�రాఫికల�లీ బలహీనమైన ధృవీకరణపత�రాన�ని వాడ�త�ంది"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
+"సర�వర� సర�టిఫికెట�, లేదా సర�వర� సర�టిఫికేట� శ�రేణి లోతైన యొక�క పొడవ�, గూఢ లైబ�రరీ ద�వారా విధించబడిన పరిమిత�లన� "
+"దాటక�ండా"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "దగ�గరలోని వ�యక�త�ల�"
 
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "యాహూ! జపాన�"
 
-#: ../libempathy/empathy-utils.c:578
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "గూగ�ల� టాక�"
 
-#: ../libempathy/empathy-utils.c:579
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "ఫేస�‌బ�క� చాట�"
 
@@ -749,72 +753,79 @@ msgstr[1] "%d నెలల క�రితం"
 msgid "in the future"
 msgstr "భవిష�యత�త�లో"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
-#, fuzzy
-#| msgid "Accounts"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
-msgstr "ఖాతాల�"
+msgstr "ఖాతాల� అన�నియ�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "ఖాతా"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "సేవకమ�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "పోర�ట�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1154
-#, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "%s అనే ఖాతా నా వెబ� ఖాతాల ద�వారా సవరించబడింది."
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "నా వెబ� ఖాతాల�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1209
+msgid "The account %s is edited via %s."
+msgstr "%s అనే ఖాతా,%s ద�వారా సవరించబడింది."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1215
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s ఖాతాన� ఎంపతిలో సవరించ�ట వీల�కాద�."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1234
 msgid "Launch My Web Accounts"
 msgstr "నా వెబ� ఖాతాలన� ప�రారంభించ�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1242
+msgid "Edit %s"
+msgstr "సవరణ "
+
+#: ../libempathy-gtk/empathy-account-widget.c:1592
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "వాడ�కరి పేర�:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1910
 msgid "A_pply"
 msgstr "అన�వర�తించ� (_p)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1940
 msgid "L_og in"
 msgstr "ప�రవేశించ� (_J)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:2014
 msgid "This account already exists on the server"
 msgstr "సేవకమ�లో ఈ ఖాతా ఇంతక�మ�ందే ఉన�నది"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:2017
 msgid "Create a new account on the server"
 msgstr "ఈ సేవకమ� పై ఒక కొత�త ఖాతాన� సృష�టించ�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2209
 msgid "Ca_ncel"
 msgstr "రద�ద�చేయి (_n)"
 
@@ -823,19 +834,19 @@ msgstr "రద�ద�చేయి (_n)"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2487
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s పై %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2513
 #, c-format
 msgid "%s Account"
 msgstr "%s ఖాతా"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2517
 msgid "New account"
 msgstr "కొత�త ఖాతా"
 
@@ -847,6 +858,7 @@ msgstr "<b>ఉదాహరణ:</b> నా తెరపేర�"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -956,76 +968,84 @@ msgstr "మీ ICQ UIN �మిటి?"
 msgid "What is your ICQ password?"
 msgstr "మీ ICQ సంకేతపదమ� �మిటి?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "స�వయం"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "నమోద�చేస�కొన�"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "�చ�ఛికాల�"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "�దీకాద�"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "అక�షర సమితి:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"చాలా IRC సర�వర�ల� మీర� భావిస�త�న�నారా కాద� మీర� కన�క, ఒక పాస�వర�డ�న� ఎంటర� చేయకండి, పాస�వర�డ� అవసరం "
+"లేద�."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "నెట� వర�క�"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "నెట�‌వర�క�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "మార�పేర�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "సంకేతపదం:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "నిష�క�రమణ సందేశం:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "అసల� పేర�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "సేవకాల�"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "మీ IRC మార�పేర� �మిటి?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "� IRC నెట�‌వర�క�?"
 
@@ -1067,8 +1087,7 @@ msgid ""
 msgstr ""
 "ఇది మీ వాడ�కరిపేర�, మీ సాధారణ ఫేస�‌బ�క� ప�రవేశం కాద�.\n"
 "ఒకవేళ మీర� facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"మీక� ఒకవేళ ఒక ఫేస�‌బ�క� వాడ�కరిపేర� లేక�ంటే <a href=\"http://www.facebook."
-"com/username/"
+"మీక� ఒకవేళ ఒక ఫేస�‌బ�క� వాడ�కరిపేర� లేక�ంటే <a href=\"http://www.facebook.com/username/"
 "\">ఈ పేజీని</a> వాడి ఒకటి సృష�టించండి."
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
@@ -1133,7 +1152,7 @@ msgstr "మొదటి పేర� (_F):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
-msgstr "జబ�బర� �డి (_J):"
+msgstr "జాబ�బర� �డి (_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
@@ -1169,23 +1188,23 @@ msgstr "విరామం (సెకన�లలో)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
-msgstr ""
+msgstr "ఇచ�ఛాపూర�వకాలన� అలాగే వ�ంచండి"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
-msgstr ""
+msgstr "దారిమళ�ళింప�న� వదిలివేయండి"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
-msgstr ""
+msgstr "యాంత�రిక తత�వం:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
-msgstr ""
+msgstr "బహ�విధాలైన ఇచ�ఛాపూర�వకాల�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
-msgstr ""
+msgstr "NAT ట�రావెర�సల� �చ�ఛికాల�"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
@@ -1209,14 +1228,18 @@ msgid "Transport:"
 msgstr "ట�రాన�స��పోర�ట�:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "లండ�లింస� మరియ� మొబైల� ఫోన�ల� కాల� ఈ ఖాతాన� ఉపయోగించండి"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "మీ SIP ఖాతా సంకేతపదం �మిటి?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "మీ SIP ప�రవేశ �డి �మిటి?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "వాడ�కరిపేర� (_U):"
 
@@ -1240,36 +1263,37 @@ msgstr "యాహూ! �డి (_D):"
 msgid "_Room List locale:"
 msgstr "గది జాబితా స�థానికం (_R):"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "బొమ�మన� మార�చలేకపోయింది"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "మీ వ�యవస�థ నంద� ఆమోదించిన � బొమ�మ ఫార�మేట�ల� సహకరించ�టలేద�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "pixbuf న�ండి png కి భద�రపర�చవద�ద�"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#| msgid "Couldn't save pixbuf to png"
+msgid "Couldn't save picture to file"
+msgstr "దస�రం లొని చిత�రాన�ని  భద�రపర�చ వద�ద�  "
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "మీ అవతారమ� బొమ�మన� ఎంచ�కోండి"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "ఒక చిత�రాన�ని తీయండి..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "బొమ�మ లేద�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "బొమ�మల�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "అన�ని ఫైళ�ళ�"
 
@@ -1277,104 +1301,101 @@ msgstr "అన�ని ఫైళ�ళ�"
 msgid "Click to enlarge"
 msgstr "పెద�దదిచేయ�టక� నొక�కండి"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
 #| msgid "There was an error while creating the account."
 msgid "There was an error starting the call"
-msgstr "ఖాతాన� సృష�టించ�నప�ప�డ� అక�కడ ఒక దోషమ� వ�ంది."
+msgstr "కాల� ప�రారంభమ�లో ఒక దోషం ఉంది"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact doesn't support calls"
-msgstr ""
+msgstr "పేర�కొన�న సంప�రదించండి కాల�స� మద�దత� ఇవ�వద�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:53
 #| msgid "The selected contact is offline."
 msgid "The specified contact is offline"
-msgstr "ఎంచ�క�న�న పరిచయమ� ఆఫ�‌లైన�లో ఉంది."
+msgstr "పేర�కొన�న పరిచయమ� ఆఫ�‌లైన�లో ఉంది."
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:55
 #| msgid "The selected contact is offline."
 msgid "The specified contact is not valid"
-msgstr "ఎంచ�క�న�న పరిచయమ� ఆఫ�‌లైన�లో ఉంది."
+msgstr "పేర�కొన�న సంప�రదించండి చెల�ల�బాట�లో లేద�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:57
 #| msgid "Topic not supported on this conversation"
 msgid "Emergency calls are not supported on this protocol"
-msgstr "ఈ సంభాషణ పై విషయమ� సహకరించ�ట లేద�"
+msgstr " అత�యవసర కాల�స� ఈ నియమావళి మద�దత� లేద�"
 
-#: ../libempathy-gtk/empathy-chat.c:695
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "రహస�య చాట�‌ని తెర�చ�టలో విఫలమైంది"
 
-#: ../libempathy-gtk/empathy-chat.c:756
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "ఈ సంభాషణ పై విషయమ� సహకరించ�ట లేద�"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "విషయమ�న� మార�చ�టక� మీర� అన�మతించబడర�"
 
-#: ../libempathy-gtk/empathy-chat.c:966
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� అనేది చెల�లని పరిచయప� �డి"
 
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ప�రస�త�త సంభాషణలోని అన�ని సందేశాలన� త�డిచివేయి"
 
-#: ../libempathy-gtk/empathy-chat.c:1026
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: ప�రస�త�త సంభాషణ యొక�క విషయమ�న� అమర�చ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1029
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: ఒక కొత�త చాట� గదిలో చేర�"
 
-#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: ఒక కొత�త చాట� గదిలో చేర�"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
-"/part [<chat room ID>] [<reason>]: ప�రస�త�తప� దానితో అప�రమేయమ�గా చాట� గదిని "
-"వదిలివెళ�ళ�"
+"/part [<chat room ID>] [<reason>]: ప�రస�త�తప� దానితో అప�రమేయమ�గా చాట� గదిని వదిలివెళ�ళ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1040
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: ఒక గోప�య చాట�‌ని తెర�వ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: ఒక గోప�య చాట�‌ని తెర�వ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1046
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: ప�రస�త�త సేవకమ�లో మీ మార�పేర�ని మార�చ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1049
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr ""
+msgstr "/me <message>:ప�రస�త�త సంభాషణక� ఒక ACTION సందేశాన�ని పంపేంద�క�"
 
-#: ../libempathy-gtk/empathy-chat.c:1052
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
+"/say <message> : ప�రస�త�త సంభాషణక� <message> పంపండి. ఈ ఒక '/' తో మొదలయ�యే ఒక సందేశాన�ని "
+"పంపడానికి ఉపయోగిస�తార�. ఉదాహరణక�: \"/ చేరడానికి / చెప�పే ఒక కొత�త చాట� రూమ� చేరడానికి ఉపయోగిస�తార�\""
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
-msgstr ""
+msgstr "/ WHOIS <contact ID>: ఒక పరిచయాన�ని గ�రించి ప�రదర�శన సమాచారం"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1382,113 +1403,113 @@ msgstr ""
 "/help [<command>]: సహకారమ� ఉన�న అన�ని ఆదేశాలన� చూపిస�త�ంది. ఒకవేళ <command> "
 "నిర�వచించబడినట�టయితే, దాని వాడ�కని చూపించ�."
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "వాడ�క: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1109
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "తెలియని ఆదేశమ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1235
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "తెలియని ఆదేశమ�; అంద�బాట�లోవ�న�న ఆదేశమ�ల కోసం /help చూడండి"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1393
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "insufficient balance to send message"
 msgstr "సందేశం పంప�టక� కావలసిన బ�యాలెన�స� లేద�"
 
-#: ../libempathy-gtk/empathy-chat.c:1395
+#: ../libempathy-gtk/empathy-chat.c:1457
 msgid "not capable"
-msgstr ""
+msgstr "సామర�ధ�యాన�ని కలిగి లేద�"
 
-#: ../libempathy-gtk/empathy-chat.c:1402
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "ఆఫ�‌లైన�"
 
-#: ../libempathy-gtk/empathy-chat.c:1405
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "చెల�లని పరిచయం"
 
-#: ../libempathy-gtk/empathy-chat.c:1408
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "అన�మతి నిరాకరించబడింది"
 
-#: ../libempathy-gtk/empathy-chat.c:1411
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "మరీ పొడవైన సందేశమ�"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "అమల�పర�చబడలేద�"
 
-#: ../libempathy-gtk/empathy-chat.c:1418
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "తెలియద�"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "'%s' సందేశం పంప�టలో దోషమ�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1490
 #, c-format
 msgid "Error sending message: %s"
 msgstr "సందేశం పంపడంలో దోషమ�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1489 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "విషయం:"
 
-#: ../libempathy-gtk/empathy-chat.c:1501
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "విషయం దీనికి అమర�చబడింది: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1503
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "� విషయం నిర�వచించిలేద�"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(� సూచనల� లేవ�)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2078
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "'%s'ని నిఘంట�వ�కి చేర�చ�"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2115
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "'%s'ని %s నిఘంట�వ�కి చేర�చ�"
 
-#: ../libempathy-gtk/empathy-chat.c:2172
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "చిర�నవ�వ�న� చేర�చ�"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2190
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "పంప� (_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2225
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "అక�షరక�రమం సూచనల� (_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2314
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "ఇటీవలి చిట�టాలన� పొంద�టలో విఫలమైంది"
 
-#: ../libempathy-gtk/empathy-chat.c:2425
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s అనన�సంధానించార�"
@@ -1496,12 +1517,12 @@ msgstr "%s అనన�సంధానించార�"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2432
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s అన�నది %2$s చేత బయటక� తోసివేయబడ�డార�"
 
-#: ../libempathy-gtk/empathy-chat.c:2435
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s తోసివేయబడ�డార�"
@@ -1509,17 +1530,17 @@ msgstr "%s తోసివేయబడ�డార�"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2443
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s అన�వార� %2$s చేత నిషేధించబడ�డార�"
 
-#: ../libempathy-gtk/empathy-chat.c:2446
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s నిషేధించబడ�డార�"
 
-#: ../libempathy-gtk/empathy-chat.c:2450
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s గదిని వదిలివెళ�ళార�"
@@ -1529,117 +1550,133 @@ msgstr "%s గదిని వదిలివెళ�ళార�"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2459
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2484
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s గదిలో చేరార�"
 
-#: ../libempathy-gtk/empathy-chat.c:2509
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ఇప�ప�డ� %s వలె అయినార�"
 
-#: ../libempathy-gtk/empathy-chat.c:2648
-#: ../src/empathy-streamed-media-window.c:1935
-#: ../src/empathy-event-manager.c:1261 ../src/empathy-call-window.c:1869
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "అనన�సంధానించబడ�డార�"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3316
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "ఈ సంకేతపదమ�న� భద�రపరచాలన�క�ంట�న�నారా?"
 
-#: ../libempathy-gtk/empathy-chat.c:3322
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "గ�ర�తించ�కొన�"
 
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "ఇప�ప�డ� కాద�"
 
-#: ../libempathy-gtk/empathy-chat.c:3376
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "మరలా ప�రయత�నించ�"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "సంకేతపదం తప�ప�; దయచేసి మళ�ళీ ప�రయత�నించండి:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3510
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "ఈ గది సంకేతపదమ�తో రక�షణ కలిగివ�ంది:"
 
-#: ../libempathy-gtk/empathy-chat.c:3537
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "చేర�"
 
-#: ../libempathy-gtk/empathy-chat.c:3739 ../src/empathy-event-manager.c:1282
-#: ../src/empathy-call-window.c:2125
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "అన�సంధానించబడ�డార�"
 
-#: ../libempathy-gtk/empathy-chat.c:3794
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "సంభాషణ"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3911
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "తెలియని లేదా చెల�లని గ�ర�తింపకం"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "పరిచయాన�ని నిరోధించ�ట తాత�కాలికంగా అంద�బాట�లోలేద�"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "పరిచయాన�ని నిరోధించ�ట అంద�బాట�లోలేద�"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "అన�మతి నిరాకరించబడింది"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "పరిచయాన�ని నిరోధించలేకపోత�ంది"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "నిరోధించబడిన పరిచయాలన� సవరించ�"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "ఖాతా:"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+#| msgid "_Blocked Contacts"
+msgid "Blocked Contacts"
+msgstr "నిరోధించబడిన సంపర�కాల�"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "తీసివేయి "
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1264
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "లింక� చిర�నామాన� నకల�తీయ� (_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1271
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "లింక�న� తెర�వ� (_O)"
 
@@ -1670,18 +1707,18 @@ msgid "Block %s?"
 msgstr "%s నిరోధించాలా?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr ""
+msgstr "మీర� మళ�ళీ మీర� సంప�రదించడం న�ండి '% s' బ�లాక� ఖచ�చితంగా?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "నిరోధించ� (_B)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "ఈ పరిచయమ� ద�ర�వినియోగాన�ని నివేదించ� (_R)"
@@ -1701,44 +1738,44 @@ msgstr "వాడ�కరిని నిరోధించ� (_B)"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
-msgstr ""
+msgstr "గ�ంప�లో లేని"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:72
 msgid "Favorite People"
 msgstr "ఇష�టమైన వ�యక�త�ల� (_F)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "మీర� నిజంగా '%s' గ�ంప�న� తీసివేయాలన�క�ంట�న�నారా?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "గ�ంప�న� తీసివేస�త�న�నది"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "తీసివేయి (_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "మీర� నిజంగానే '%s' పరిచయాన�ని తీసివేయాలన�క�ంట�న�నారా?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "పరిచయాన�ని తీసివేస�త�న�నది"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "పరిచయాన�ని జతచేయి...(_A)"
 
@@ -1747,48 +1784,48 @@ msgid "_Block Contact"
 msgstr "పరిచయాన�ని నిరోధించ� (_B)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "చాట� (_C)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "ఆడియో కాల� (_A)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "వీడియో కాల� (_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "మ�న�పటి సంభాషణల� (_P)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "ఫైల�న� పంప�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "నా డెస�క��టాప�‌న� పంచ�కొన�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:843
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "ఇష�టాంశమ�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "సమాచారమ� (_m)"
 
@@ -1798,33 +1835,41 @@ msgid "_Edit"
 msgstr "సవరణ (_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "మిమ�మల�ని ఈ గదికి ఆహ�వానిస�త�న�నార�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "చాట� గదికి ఆహ�వానించ� (_I)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "పరిచయాలన� వెత�క�"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "వెత�క�: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "పరిచయాన�ని జతచేయి...(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "� పరిచయాల� కనపడలేద�"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "మీ సందేశం మిమ�మల�ని  పరిచయం చెస�త�ంది:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "మీర� ఆన�లైన� ఉన�నప�ప�డ� నన�న� చూడండి తెలియచేయండి. ధన�యవాదాల�!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "ఒక పరిచయాన�ని ఎంచ�కొన�"
@@ -1877,153 +1922,153 @@ msgstr "దూరంగా ఉన�నప�డ� సందేశమ�:"
 msgid "Channels:"
 msgstr "ఛానళ�ళ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "దేశమ� ISO కోడ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "దేశమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "రాష�ట�రమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "పట�టణమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "ప�రాంతమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "పోస�టల� కోడ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "వీధి:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "భవనమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "అంతస�థ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "గది:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "పాఠ�యమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "వివరణ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "ఖచ�చితత�వ స�థాయి:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "దోషమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "నిల�వ� దోషమ� (మీటర�ల�):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "అడ�డ దోషమ� (మీటర�ల�):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "వేగమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "బేరింగ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "ఎక�క� వేగమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "చివరిగా నవీకరించబడింది:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "రేఖాంశమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "అక�షాంశమ�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "ఎత�త�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "స�థానమ�"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y at %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "అవతారాన�ని భద�రపర�చ�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "అవతారాన�ని భద�రపరచలేకపోత�ంది"
 
@@ -2033,7 +2078,7 @@ msgstr "<b>స�థానమ�</b> ఈ (తేది)వద�ద\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "అలియాస�:"
 
@@ -2053,7 +2098,7 @@ msgstr "పరిచయమ� వివరాల�"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "గ�ర�తించ�నది:"
 
@@ -2079,8 +2124,7 @@ msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
-"గ�ంప�లో కనిపించాలన�క�ంట�న�న పరిచయాన�ని ఎంచ�కోండి.  మీర� ఒకటి కన�నా ఎక�క�వ "
-"గ�ంప�లన� "
+"గ�ంప�లో కనిపించాలన�క�ంట�న�న పరిచయాన�ని ఎంచ�కోండి.  మీర� ఒకటి కన�నా ఎక�క�వ గ�ంప�లన� "
 "ఎంచ�కొనవచ�చ� లేదా అస�సల� ఎంచ�కొనపోవచ�చ�నని గమనించండి."
 
 #: ../libempathy-gtk/empathy-groups-widget.c:364
@@ -2093,17 +2137,17 @@ msgid "Select"
 msgstr "ఎంచ�కోండి"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "గ�ంప�"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "కిందపేర�కొన�న గ�ర�తింప� నిరోధించబడ�న�:"
 msgstr[1] "కిందపేర�కొన�న గ�ర�తింప�ల� నిరోధించబడ�న�:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "కిందపేర�కొన�న గ�ర�తింప� నిరోధించబడద�:"
@@ -2129,41 +2173,69 @@ msgstr "జాబితాలో ఎడమవైపà±� à°Žà°‚à°šà±�కోబడà
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:137
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "కాల� స�థానానికి ఉపయోగించడానికి ఖాతా ఎంచ�కోండి"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "కాల�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+#| msgid "Provide"
+msgid "Mobile"
+msgstr "మొబైల�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "పని "
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "ఇల�ల� "
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "సవరణ (_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:945
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "పరిచయాలన� లింక�చేయి...(_O)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "తొలగించ� మరియ� నిరోధించ� (_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
+"మీర� నిజంగా లింక� పరిచయం '% s' తొలగించడానికి అన�క�ంట�న�నారా? ఈ లింక� సంప�రదించండి న� తయార�చేసే అన�ని "
+"పరిచయాలన� తొలగిస�త�ంది గమనించండి."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2218,7 +2290,7 @@ msgstr "అన�‌లింక� చేయి...(_U)"
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
 "Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
+msgstr "పూర�తిగా ప�రత�యేక పరిచయాలన� లోకి ప�రదర�శించబడే లింక� పరిచయాలన� విడిపోయార�."
 
 #. Add button
 #. Translators: this is an action button in the linking dialogue. "Link" is
@@ -2238,219 +2310,217 @@ msgid ""
 "Are you sure you want to unlink these linked contacts? This will completely "
 "split the linked contacts into separate contacts."
 msgstr ""
+"మీర� ఈ లింక� పరిచయాలన� లింక� తొలగించడానికి నిశ�చయించ�క�న�నారా? ఈ పూర�తిగా ప�రత�యేక పరిచయాలన� లోకి లింక� "
+"పరిచయాలన� స�ప�లిట� ఉంట�ంది."
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "అన�‌లింక� చేయి (_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "చరిత�ర"
+
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
-msgstr ""
+msgstr "చూపించ�"
 
-#: ../libempathy-gtk/empathy-log-window.c:527
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "వెత�క�"
 
-#: ../libempathy-gtk/empathy-log-window.c:745
-#: ../libempathy-gtk/empathy-log-window.c:859
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1159
+msgid "Chat in %s"
+msgstr "%sతో  చాట�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+msgid "Chat with %s"
+msgstr "% S తో చాట�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 #| msgid "%A %B %d %Y"
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
-msgstr "%A %B %d %Y"
-
-#: ../libempathy-gtk/empathy-log-window.c:747
-#, fuzzy, c-format
-#| msgid "Call with %s"
-msgid "Chat with %s"
-msgstr "%sతో కాల� చేయి"
+msgstr "%A %B %d %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:814
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
-msgstr ""
+msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:822
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
-msgstr ""
+msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:878
-#: ../libempathy-gtk/empathy-log-window.c:880 ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+#: ../libempathy-gtk/empathy-log-window.c:1382
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s రెండవ "
+msgstr[1] "%d సెకన�ల క�రితం"
 
-#: ../libempathy-gtk/empathy-log-window.c:887
+#: ../libempathy-gtk/empathy-log-window.c:1389
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%d నిమ�షమ�"
+msgstr[1] "%d నిమ�షాల�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
 #, c-format
 msgid "Call took %s, ended at %s"
-msgstr ""
+msgstr "కాల�,% s పట�టింది% s వద�ద మ�గిసింది"
 
-#: ../libempathy-gtk/empathy-log-window.c:1213
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
-msgstr ""
+msgstr "నేడ�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1217
-#, fuzzy
-#| msgid "Western"
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
-msgstr "వెస�ట�రన�"
+msgstr "నిన�న"
 
-#: ../libempathy-gtk/empathy-log-window.c:1233
-#, fuzzy
-#| msgid "%A %B %d %Y"
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
-msgstr "%A %B %d %Y"
+msgstr "%A %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1314
-#: ../libempathy-gtk/empathy-log-window.c:2680
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
-msgstr ""
+msgstr "� సమయమ�లోనా"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
-#: ../libempathy-gtk/empathy-log-window.c:1688
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 #| msgid "None"
 msgid "Anyone"
-msgstr "�దీకాద�"
+msgstr "ఎవరైనా"
 
-#: ../libempathy-gtk/empathy-log-window.c:1953
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
-msgstr ""
+msgstr "ఎవర�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2156
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
-msgstr ""
+msgstr "ఎప�డ�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2272
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
-msgstr ""
+msgstr "�దైనా"
 
-#: ../libempathy-gtk/empathy-log-window.c:2274
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3007
 #| msgid "Set status"
 msgid "Text chats"
-msgstr "స�థితిని అమర�చ�"
+msgstr "పాఠ�య చాట�ల�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2276
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
 #| msgid "Call"
 msgid "Calls"
-msgstr "కాల�"
+msgstr "కాల�స� "
 
-#: ../libempathy-gtk/empathy-log-window.c:2281
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3014
 #| msgid "Incoming call"
 msgid "Incoming calls"
-msgstr "లోనికివచ�చ� కాల�"
+msgstr "లోనికివచ�చ� కాల�స�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2282
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3015
 #| msgid "Outgoing voice call"
 msgid "Outgoing calls"
-msgstr "బయటక� వెళ�ళ� వాయిస� కాల�"
+msgstr "బయటక� వెళ�ళ� వాయిస� కాల�స�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2283
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3016
 #| msgid "Missed call from %s"
 msgid "Missed calls"
-msgstr "%s న�ండి మిస�స�డ� కాల� వచ�చింది"
+msgstr "మిస�స�డ� కాల�స�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2304
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3038
 #| msgid "Chat"
 msgid "What"
-msgstr "చాట�"
+msgstr "�మిటి"
 
-#: ../libempathy-gtk/empathy-log-window.c:2917
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
-msgstr ""
+msgstr "మీర� మ�న�పటి సంభాషణల� అన�ని లాగ�లన� తొలగించడానికి నిశ�చయించ�క�న�నారా?"
 
-#: ../libempathy-gtk/empathy-log-window.c:2921
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3751
 #| msgid "C_lear"
 msgid "Clear All"
-msgstr "శ�భ�రపరచ� (_l)"
+msgstr "అన�న శ�భ�రపరచ� "
 
-#: ../libempathy-gtk/empathy-log-window.c:2928
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3758
 #| msgid "Connected from:"
 msgid "Delete from:"
-msgstr "దీని న�ండి అన�సంధానించబడింది:"
+msgstr "దీని న�ండి తొలగ�మిచ�:"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-#: ../src/empathy-streamed-media-window.c:1340
-msgid "Call"
-msgstr "కాల�"
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\"> లోడ� అవ�తోంది ...</ span>మ�త"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
 msgstr "చాట�"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "History"
-msgstr ""
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#, fuzzy
+msgid "Delete All History..."
+msgstr "చరిత�ర అన�న  తొలగించ� ."
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
 #| msgid "Provide"
 msgid "Profile"
-msgstr "సమకూర�చ�"
+msgstr "ప�రొఫైల�"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-call-window.ui.h:20
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 msgstr "వీడియో"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "సవరణ (_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
 #| msgid "File"
 msgid "_File"
-msgstr "ఫైల�"
+msgstr "ఫైల� (_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:8
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
-msgstr ""
+msgstr "పేజీ 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "పరిచయమ� �డి:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "చాట� (_h)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "కొత�త సంభాషణ"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "వీడియోన� పంప� (_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "కాల� (_a)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "కొత�త కాల�"
 
@@ -2469,34 +2539,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "అన�రూపిత సందేశమ�..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "అన�రూపిత సందేశాలన� సవరించ�..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "ఈ స�థితిని ఇష�టాంశమ� న�ండి తీసివేయ�టక� నొక�కండి"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "ఈ స�థితిని ఇష�టాంశమ�గా చేయ�టక� నొక�కండి"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "స�థితిని అమర�చ�"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "మీ ఉనికిని మరియ� ప�రస�త�త స�థితిని అమర�చండి"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "అన�రూపిత సందేశాల�..."
 
@@ -2510,24 +2580,27 @@ msgid "New %s account"
 msgstr "కొత�త %s ఖాతా"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "తర�వాతది కన�గొన�"
+msgid "Find:"
+msgstr "కన�గొన�:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "మ�న�పటిది కన�గొన�"
+#| msgid "Match case"
+msgid "Mat_ch case"
+msgstr "సరిపోల� సందర�భం (_c)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "కన�గొన�:"
+msgid "Phrase not found"
+msgstr "పదబందం కనపడలేద�"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "సరిపోల� సందర�భం"
+#| msgid "_Next Tab"
+msgid "_Next"
+msgstr "తర�వాత (_N)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "పదబందం కనపడలేద�"
+#| msgid "_Previous Tab"
+msgid "_Previous"
+msgstr "మ�న�పటి (_P)"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2569,45 +2642,39 @@ msgstr "బయటక� వెళ�ళ� వాయిస� కాల�"
 msgid "Voice call ended"
 msgstr "వాయిల� కాల� మ�గిసినది"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "అన�రూపిత సందేశమ�న� ప�రవేశపెట�ట�"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "అన�రూపిత సందేశాలన� సవరించ�"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "కొత�త స�థితి సందేశాన�ని భద�రపర�చ� (_N)"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "భద�రపర�చబడిన స�థితి సందేశాల�"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+#| msgid "Message received"
+msgid "Message edited at %s"
+msgstr "సందేశం% s వద�ద సవరించబడింది"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1782
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "సాధారణ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "శాస�త�రీయ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "సరళమైన"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "శ�భ�రమ�చేయి"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "నీలం"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
-msgstr ""
+msgstr "చాట� సర�వర� అందించిన గ�ర�తింప� ధ�ర�వీకరించబడద�."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
 msgid "The certificate is not signed by a Certification Authority."
@@ -2666,8 +2733,7 @@ msgstr "కొనసాగ�"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
 msgid "This connection is untrusted. Would you like to continue anyway?"
-msgstr ""
-"అన�సంధానమ� నమ�మదగినది కాద�. �ది �మైనప�పటికీ మీర� కొనసాగాలన�క�ంట�న�నారా?"
+msgstr "అన�సంధానమ� నమ�మదగినది కాద�. �ది �మైనప�పటికీ మీర� కొనసాగాలన�క�ంట�న�నారా?"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:297
 msgid "Remember this choice for future connections"
@@ -2677,29 +2743,28 @@ msgstr "మ�న�మ�ంద� అన�సంధానాలక� ఈ ఎ
 msgid "Certificate Details"
 msgstr "ధృవీకరణపత�రం వివరాల�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "URI తెర�వలేకపోత�ంది"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "ఒక ఫైల�‌ని ఎంచ�కొన�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "ఫైల�న� భద�రపర�చ�టక� తగిన ఖాళీ స�థలమ� లేద�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
-"ఈ ఫైల�న� భద�రపర�చ�టక� %s ఖాళీ స�థలమ� అవసరమ�, కాని కేవలం %s మాత�రమే అంద�బాట�లో "
-"ఉన�నది. దయచేసి "
+"ఈ ఫైల�న� భద�రపర�చ�టక� %s ఖాళీ స�థలమ� అవసరమ�, కాని కేవలం %s మాత�రమే అంద�బాట�లో ఉన�నది. దయచేసి "
 "వేరొక స�థానమ�న� ఎన�న�కోండి."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s న�ండి ఫైల� లోనికివస�త�న�నది"
@@ -2887,23 +2952,23 @@ msgstr "� దోష సందేశమ� లేద�"
 msgid "Instant Message (Empathy)"
 msgstr "సత�వర సందేశం (ఎంపతి)"
 
-#: ../src/empathy.c:309
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "వ�యవస�థ ప�రారంభమ�లో అన�సంధానించవద�ద�"
 
-#: ../src/empathy.c:313
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "వ�యవస�థ ప�రారంభమయినప�డ� పరిచయ జాబితా గాని లేక � ఇతర డైలాగ�లన� చూపవద�ద�"
 
-#: ../src/empathy.c:321
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- ఎంపతి IM క�లయింట�"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "ఖాతా నిర�వాహకాన�ని సంప�రదించ�టలో దోషమ�"
 
-#: ../src/empathy.c:502
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2911,6 +2976,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"టెలెపథ�య�  ఖాతా మేనేజర� కనెక�ట� చేసేటప�ప�డ� ఒక లోపం ఉంది. లోపం జరిగినది:\n"
+"\n"
+"% s"
 
 #: ../src/empathy-about-dialog.c:81
 msgid ""
@@ -2919,10 +2987,8 @@ msgid ""
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
-"ఎంపతి అనేది ఒక ఉచిత సాఫ�ట��వేర�; దీనిని మీర� ఫ�రీ సాఫ�ట��వేర� ఫౌండేషన� "
-"ప�రచ�రించిన విధంగా గ�నూ జనరల� పబ�లిక� "
-"లైసెన�స�  నిబంధనలక� అన�గ�ణంగా పంచవచ�చ� మరియ�/లేదా సవరించవచ�చ�; వెర�షన� 2 "
-"లైసెన�స�, లేదా (మీ �చ�చికాన�ని "
+"ఎంపతి అనేది ఒక ఉచిత సాఫ�ట��వేర�; దీనిని మీర� ఫ�రీ సాఫ�ట��వేర� ఫౌండేషన� ప�రచ�రించిన విధంగా గ�నూ జనరల� పబ�లిక� "
+"లైసెన�స�  నిబంధనలక� అన�గ�ణంగా పంచవచ�చ� మరియ�/లేదా సవరించవచ�చ�; వెర�షన� 2 లైసెన�స�, లేదా (మీ �చ�చికాన�ని "
 "బట�టి) �దైనా తర�వాత వెర�షన�."
 
 #: ../src/empathy-about-dialog.c:85
@@ -2932,10 +2998,8 @@ msgid ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
-"ఎంపతి అనేది � విధమైన పూచికత�త�ల� లేక�ండా ఉపయోగపడ�త�ందనే నమ�మకంతో పంచబడ�త�ంది; "
-"వ�యాపారానికి గాని లేదా "
-"ఒక ఖచ�చితమైన ప�రయోజనానికి ఉపయోగించవచ�చని కనీసం భావించిన పూచికత�త�ల� కూడా "
-"లేక�ండా ఇవ�వబడ�త�ంది.  "
+"ఎంపతి అనేది � విధమైన పూచికత�త�ల� లేక�ండా ఉపయోగపడ�త�ందనే నమ�మకంతో పంచబడ�త�ంది; వ�యాపారానికి గాని లేదా "
+"ఒక ఖచ�చితమైన ప�రయోజనానికి ఉపయోగించవచ�చని కనీసం భావించిన పూచికత�త�ల� కూడా లేక�ండా ఇవ�వబడ�త�ంది.  "
 "మరిన�ని వివరాలక� గ�నూ జనరల� పబ�లిక� లైసెన�స� చూడండి."
 
 #: ../src/empathy-about-dialog.c:89
@@ -2944,14 +3008,13 @@ msgid ""
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr ""
-"మీర� ఎంపతితో పాట�గా గ�నూ జనరల� పబ�లిక� లైసెన�స� యొక�క నకల� పొందివ�ండాలి; "
-"ఒకవేళ పొందకపోతే, Free "
-"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
-"1301 USA కి వ�రాయండి"
+"మీర� ఎంపతితో పాట�గా గ�నూ జనరల� పబ�లిక� లైసెన�స� యొక�క నకల� పొందివ�ండాలి; ఒకవేళ పొందకపోతే, Free "
+"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301 USA కి వ�రాయండి"
 
 #: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
-msgstr "GNOME కొరక� సత�వర సందేశక క�లయింట�"
+msgstr "గ�నోమ� కొరక� సత�వర సందేశక క�లయింట�"
 
 #: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
@@ -2985,8 +3048,7 @@ msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
-"మీర� మీ ఖాతాల సమాచారమ�న� ప�రవేశపెట�ట�టక� మరలా వెనక�క�వెళ�ళి ప�రయత�నించవచ�చ� "
-"లేదా ఈ సహాయకాన�ని నిష�క�రమించి "
+"మీర� మీ ఖాతాల సమాచారమ�న� ప�రవేశపెట�ట�టక� మరలా వెనక�క�వెళ�ళి ప�రయత�నించవచ�చ� లేదా ఈ సహాయకాన�ని నిష�క�రమించి "
 "మరియ� సవరణ మెనూ న�ండి మీ ఖాతాలన� తర�వాత జతచేయండి."
 
 #: ../src/empathy-account-assistant.c:220
@@ -3025,10 +3087,8 @@ msgid ""
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
-"ఎంపతితో మీర� ఆన�‌లైన�లో ఉన�న వ�యక�త�లతో మాట�లాడవచ�చ�న� మరియ� గూగ�ల� టాక�, "
-"AIM, విండోస� లైవ� వంటి ఇతర "
-"చాట� ప�రోగ�రామ�ల� ఉపయోగించే తోటివారితో మరియ� స�నేహిత�లతో చాట� చేయవచ�చ�. "
-"మైక�రోఫోన� లేదా వెబ�‌కామ�‌తో మీర� ఆడియో లేదా "
+"ఎంపతితో మీర� ఆన�‌లైన�లో ఉన�న వ�యక�త�లతో మాట�లాడవచ�చ�న� మరియ� గూగ�ల� టాక�, AIM, విండోస� లైవ� వంటి ఇతర "
+"చాట� ప�రోగ�రామ�ల� ఉపయోగించే తోటివారితో మరియ� స�నేహిత�లతో చాట� చేయవచ�చ�. మైక�రోఫోన� లేదా వెబ�‌కామ�‌తో మీర� ఆడియో లేదా "
 "వీడియో కాల�స�న� కూడా చేయవచ�చ�."
 
 #: ../src/empathy-account-assistant.c:629
@@ -3049,8 +3109,7 @@ msgstr "లేద�, నాక� ఒక కొత�త ఖాతా కావ
 
 #: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
-msgstr ""
-"లేద�, ఇప�ప�డ� కేవలం దగ�గరలోని ఆన�‌లైన�‌లోవ�న�న వ�యక�త�లన� చూడాలన�క�ంట�న�నాన�"
+msgstr "లేద�, ఇప�ప�డ� కేవలం దగ�గరలోని ఆన�‌లైన�‌లోవ�న�న వ�యక�త�లన� చూడాలన�క�ంట�న�నాన�"
 
 #: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
@@ -3073,6 +3132,9 @@ msgid ""
 "details below are correct. You can easily change these details later or "
 "disable this feature by using the 'Accounts' dialog"
 msgstr ""
+"తాదాత�మ�యం స�వయంచాలకంగా కన�గొనడంలో మరియ� మీర� అదే నెట�వర�క� పై కనెక�ట� ప�రజల� చాట� చెయ�యవచ�చ�. న� "
+"ఉపయోగించడానికి మీర� భావించినా, క�రింద వివరాలన� సరైనవని తనిఖీ చెయ�యండి. మీర� స�లభంగా 'అకౌంట�స�' డైలాగ� "
+"ఉపయోగించి ఈ ఫీచర� తర�వాత ఈ వివరాల� మార�ప� లేదా సాధ�యం చేస�కోవచ�చ�"
 
 #: ../src/empathy-account-assistant.c:1091
 #: ../src/empathy-account-assistant.c:1147
@@ -3090,6 +3152,9 @@ msgid ""
 "install the telepathy-salut package and create a People Nearby account from "
 "the Accounts dialog"
 msgstr ""
+"మీర� telepathy-salut ఇన�స�టాల� కాద� అని, మీ స�థానిక నెట�వర�క� అన�సంధానం ప�రజల� చాట� చేయలేర�. మీర� "
+"ఈ లక�షణాలన� సాధ�యం భావించినా, telepathy-salut ప�యాకేజీ ఇన�స�టాల� దయచేసి మరియ� అకౌంట�స� డైలాగ� న�ండి ఒక "
+"పీప�ల� సమీపంలో ఖాతాని సృష�టించ�కోండి"
 
 #: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
@@ -3125,7 +3190,8 @@ msgid "Your new account has not been saved yet."
 msgstr "మీ కొత�త ఖాతా ఇంకా భద�రపర�చబడలేద�."
 
 #: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "అన�సంధానిస�త�న�నది..."
 
@@ -3194,10 +3260,9 @@ msgstr ""
 "మీర� కొనసాగాలన�క�ంట�న�నారా?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-#, fuzzy
 #| msgid "_Add…"
 msgid "Add…"
-msgstr "జతచేయి...(_A)"
+msgstr "జతచేయి..."
 
 #: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
@@ -3211,19 +3276,12 @@ msgstr "à°� à°ªà±�రోటోకాలà±� à°¸à±�థాపించబడిలà
 msgid "Protocol:"
 msgstr "ప�రోటోకాల�:"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-#, fuzzy
-#| msgid "_Remove"
-msgid "Remove"
-msgstr "తీసివేయి (_R)"
-
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
-"కొత�త ఖాతాన� జతచేయ�టక�, మీర� ఉపయోగించాలన�క�ంట�న�న ప�రతీ ప�రొటోకాల�‌క� మొదట "
-"బ�యాకెండ�‌న� స�థాపించాలి."
+"కొత�త ఖాతాన� జతచేయ�టక�, మీర� ఉపయోగించాలన�క�ంట�న�న ప�రతీ ప�రొటోకాల�‌క� మొదట బ�యాకెండ�‌న� స�థాపించాలి."
 
 #: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
@@ -3241,338 +3299,369 @@ msgstr "ఎంపతి à°ªà±�రామాణీకరణ à°•à±�లయింటà
 msgid "People nearby"
 msgstr "దగ�గరలోని ప�రజల�"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- ఎంపతి ఆడియో/వీడియో క�లయింట�"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "ఎంపతి ఆడియో/వీడియో క�లయింట�"
 
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "భేదమ�"
 
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "ప�రకాశమ�"
 
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "గామా"
 
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "ధ�వనిస�థాయి"
 
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "పక�క పట�టీ(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1173
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "ఆడియో ఇన�‌ప�ట�"
 
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "వీడియో ఇన�‌ప�ట�"
 
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "డయల�‌ప�యాడ�"
 
-#: ../src/empathy-streamed-media-window.c:1192
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "వివరాల�"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1261
-#: ../src/empathy-call-window.c:1239
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "%sతో కాల� చేయి"
 
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "యంత�రమ�తో చూడబడిన IP చిర�నామా"
 
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "అంతర�జాలంతో ఒక సేవకమ�తో చూడబడిన IP చిర�నామా"
 
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
-msgstr ""
+msgstr "ఇతర వైప� కనిపించే పీర� యొక�క IP చిర�నామా"
 
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "రిలే సేవకమ� యొక�క IP చిర�నామా"
 
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "బహ�ళప�రసార గ�ంప� యొక�క IP చిర�నామా"
 
-#: ../src/empathy-streamed-media-window.c:1884
+#: ../src/empathy-streamed-media-window.c:1843
 msgctxt "encoding video codec"
 msgid "Unknown"
 msgstr "తెలియద�"
 
-#: ../src/empathy-streamed-media-window.c:1887
+#: ../src/empathy-streamed-media-window.c:1846
 msgctxt "encoding audio codec"
 msgid "Unknown"
 msgstr "తెలియద�"
 
-#: ../src/empathy-streamed-media-window.c:1890
+#: ../src/empathy-streamed-media-window.c:1849
 msgctxt "decoding video codec"
 msgid "Unknown"
 msgstr "తెలియద�"
 
-#: ../src/empathy-streamed-media-window.c:1893
+#: ../src/empathy-streamed-media-window.c:1852
 msgctxt "decoding audio codec"
 msgid "Unknown"
 msgstr "తెలియద�"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "అన�సంధానించబడింది — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "సాంకేతిక వివరాల�"
 
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
-msgstr ""
-"మీ కంప�యూటర�చే సహకరించబడ�త�న�న � ఆడియో ఫార�మేట�లన� %s సాఫ�ట�‌వేర� "
-"అర�థంచేస�కోలేకపోత�న�నది"
+msgstr "మీ కంప�యూటర�చే సహకరించబడ�త�న�న � ఆడియో ఫార�మేట�లన� %s సాఫ�ట�‌వేర� అర�థంచేస�కోలేకపోత�న�నది"
 
-#: ../src/empathy-streamed-media-window.c:2289
-#: ../src/empathy-call-window.c:2230
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
-msgstr ""
+msgstr "% s యొక�క సాఫ�ట�వేర� మీ కంప�యూటర� మద�దత� వీడియో ఫార�మాట�లలో అర�థం లేద�"
 
-#: ../src/empathy-streamed-media-window.c:2295
-#: ../src/empathy-call-window.c:2236
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr ""
-"%s కి అన�సంధానమ�న� స�థాపించలేకపోత�న�నది. మీలో ఒకర� నేర�గా అన�సంధానమగ�టక� "
-"అన�మతించని నెట�‌వర�క� పై "
+"%s కి అన�సంధానమ�న� స�థాపించలేకపోత�న�నది. మీలో ఒకర� నేర�గా అన�సంధానమగ�టక� అన�మతించని నెట�‌వర�క� పై "
 "ఉండి వ�ండవచ�చ�న�."
 
-#: ../src/empathy-streamed-media-window.c:2301
-#: ../src/empathy-call-window.c:2242
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "నెట�‌వర�క� నంద� వైఫల�యమ� ఉన�నది"
 
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "ఈ కాల�‌కి అవసరమైన ఆడియో ఫార�మేట�ల� మీ కంప�యూటర�‌లో స�థాపించబడిలేవ�"
 
-#: ../src/empathy-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "ఈ కాల�‌కి అవసరమైన వీడియో ఫార�మేట�ల� మీ కంప�యూటర�‌లో స�థాపించబడిలేవ�"
 
-#: ../src/empathy-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 msgstr ""
+"ఊహించని �దో ఒక Telepathy భాగం లో జరిగింది. దయచేసి <a href=\"%s\"> ఈ బగ� నివేదిక </ a> మరియ� "
+"సహాయం మెన� లో 'డీబగ�' విండో న�ండి సేకరించిన లాగ�లన� అటాచ�."
 
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "కాల� ఇంజన�లో ఒక వైఫల�యమ� ఉన�నది"
 
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "ప�రవాహమ� చివరక� చేర�క�న�నది"
 
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "ఆడియో ప�రవాహాన�ని స�థాపించలేకపోత�ంది"
 
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "వీడియో ప�రవాహాన�ని స�థాపించలేకపోత�ంది"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "ఆడియో"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "పరిచయానికి మళ�ళీ కాల� చేయి"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "కెమెరా ఆప�"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "డీకోడింగ� కొడెక�:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "కెమెరా ఆన� చేయి"
+#| msgid "_Disable"
+msgid "Disable camera"
+msgstr "కెమెరా నిలిపివేయి"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "డీకోడింగ� కొడెక�:"
+msgid "Display the dialpad"
+msgstr "డీల�పడ�  ప�రదర�శన"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "కెమెరాన� అచేతనపర�చ� మరియ� వీడియోని పంప�ట ఆపివేయి"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "ఎన�కోడింగ� కొడెక�:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "కెమెరాన� చేతనపరిచి, వీడియోన� పంప�"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "హాంగ� చేయి"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "కెమెరాన� చేతనపర�చ� కాని వీడియో పంపవద�ద�"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "ప�రస�త�త కాల�‌ని హాంగ� చేయి"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "ఎన�కోడింగ� కొడెక�:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "స�థానిక అభ�యర�ధి:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "హాంగ� చేయి"
+msgid "Maximise me"
+msgstr "నన�న� గరిష�టీకరించ�"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "ప�రస�త�త కాల�‌ని హాంగ� చేయి"
+msgid "Minimise me"
+msgstr "నన�న� కనిష�టీకరించ�"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "స�థానిక అభ�యర�ధి:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "దూరస�థ అభ�యర�ధి:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "మ�న�జూప�"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "ఆడియోన� పంప�"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "తిరిగిడయిల�‌చేయి"
+#| msgid "Send _Video"
+msgid "Send Video"
+msgstr "వీడియోన� పంప� "
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "దూరస�థ అభ�యర�ధి:"
+#| msgid "Dialpad"
+msgid "Show dialpad"
+msgstr "చ�ప� డీల�ప"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "ఆడియోన� పంప�"
+msgid "Start a video call"
+msgstr "ఒక వీడియో కాల� ప�రారంభండ�"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr ""
+msgid "Start an audio call"
+msgstr "ఒక ఆడియో కాల� ప�రారంభం"
 
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-call-window.c:1824
-#: ../src/empathy-call-window.c:1825 ../src/empathy-call-window.c:1826
-#: ../src/empathy-call-window.c:1827
-msgid "Unknown"
-msgstr "తెలియద�"
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "మార�పిడి కెమెరా"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "వీడియో (_i)"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "నొక�కండి ఆడియో ప�రసార"
 
-#: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "వీడియో ఆప�"
+#: ../src/empathy-call-window.ui.h:20
+msgid "Toggle video transmission"
+msgstr "నొక�కండి వీడియో ప�రసార"
 
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "వీడియో ఆన�‌చేయి"
+#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "తెలియద�"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "వీడియో మ�న�జూప�"
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "Video call"
+msgstr "వీడియో కాల� "
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "కాల� (_C)"
 
 #: ../src/empathy-call-window.ui.h:25
-#, fuzzy
-#| msgid "Dialpad"
-msgid "_Dialpad"
-msgstr "డయల�‌ప�యాడ�"
+#| msgid "Camera On"
+msgid "_Camera"
+msgstr "కెమెరా (_C)"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "విషయసూచిక (_C)"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "డీబగ� (_D)"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "సహాయం (_H)"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "మైక�రోఫోన� (_M)"
+
+#: ../src/empathy-call-window.ui.h:31
+#| msgid "Geoclue Settings"
+msgid "_Settings"
+msgstr "అమరికల� (_S)"
 
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "వీక�షణం (_V)"
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d చద�వనిది)"
 msgstr[1] "%s (%d చద�వనివి)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (మరియ� %u ఇతర)"
 msgstr[1] "%s (మరియ� %u ఇతరాల�)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ఇతర�ల న�ండి చదవనివి)"
 msgstr[1] "%s (%d ఇతర�ల న�ండి చదవనివి)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d అన�నిటిని న�ండి చదవనివి)"
 msgstr[1] "%s (%d అన�నిటిని న�ండి చదవనివి)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d సందేశమ�న� పంప�త�న�నది"
 msgstr[1] "%d సందేశాలన� పంప�త�న�నది"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "ఒక సందేశమ�న� టైప� చేస�త�న�నార�."
 
@@ -3604,10 +3693,6 @@ msgstr "à°Ÿà±�యాబà±�‌నà±� à°•à±�డివైపà±�à°•à±� à°•à°¦à±�à°ªà
 msgid "Notify for All Messages"
 msgstr "అన�ని సందేశాలకూ తెలియజేయి"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "విషయసూచిక (_C)"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "సంభాషణ (_C)"
@@ -3620,10 +3705,6 @@ msgstr "ట�యాబ�‌న� వేర�చేయి (_D)"
 msgid "_Favorite Chat Room"
 msgstr "ఇష�టమైన చాట� గది (_F)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "సహాయం (_H)"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "తర�వాత ట�యాబ� (_N)"
@@ -3644,15 +3725,15 @@ msgstr "ట�యాబ�‌ల� (_T)"
 msgid "_Undo Close Tab"
 msgstr "ట�యాబ�‌ని మూసివేయ�ట రద�ద�చేయి (_U)"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "పేర�"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "గది"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "స�వయం-అన�సంధానం"
 
@@ -3660,95 +3741,96 @@ msgstr "స�వయం-అన�సంధానం"
 msgid "Manage Favorite Rooms"
 msgstr "ఇష�టమైన గద�లన� నిర�వహించ�"
 
-#: ../src/empathy-event-manager.c:542
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "లోనికివచ�చ� వీడియో కాల�"
 
-#: ../src/empathy-event-manager.c:542
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "లోనికివచ�చ� కాల�"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s మీక� వీడియో కాల� చేస�త�న�నార�, మీర� సమాధానమివ�వాలన�క�ంట�న�నారా?"
 
-#: ../src/empathy-event-manager.c:547
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s మీక� కాల� చేస�త�న�నార�. మీర� సమాధానమివ�వాలన�క�ంట�న�నారా?"
 
-#: ../src/empathy-event-manager.c:550 ../src/empathy-event-manager.c:751
-#: ../src/empathy-event-manager.c:784
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s న�ండి లోనికి కాల� వస�త�న�నది"
 
-#: ../src/empathy-event-manager.c:575
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "తిరస�కరించ� (_R)"
 
-#: ../src/empathy-event-manager.c:583 ../src/empathy-event-manager.c:591
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "సమాధానంయివ�వ� (_A)"
 
-#: ../src/empathy-event-manager.c:591
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer with video"
-msgstr ""
+msgstr "వీడియోతో జవాబ�వ�వండి (_A)"
 
-#: ../src/empathy-event-manager.c:751 ../src/empathy-event-manager.c:784
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s న�ండి వీడియో కాల� వస�త�న�నది"
 
-#: ../src/empathy-event-manager.c:857
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "గది ఆహ�వానమ�"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s లో చేర�టక� ఆహ�వానం"
 
-#: ../src/empathy-event-manager.c:866
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s మిమ�మలన� %sక� జేర�టక� ఆహ�వానిస�త�న�నార�"
 
-#: ../src/empathy-event-manager.c:874
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "తిరస�కరించ�(_D)"
 
-#: ../src/empathy-event-manager.c:879
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "చేర� (_J)"
 
-#: ../src/empathy-event-manager.c:906
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s మిమ�మ�లన� %sనంద� జేర�టక� ఆహ�వానించార�"
 
-#: ../src/empathy-event-manager.c:912
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "%s లో చేర�టక� మీర� ఆహ�వానించబడ�డార�"
 
-#: ../src/empathy-event-manager.c:963
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s న�ండి వచ�చ�చ�న�న ఫైల� బదిలీకరణ"
 
-#: ../src/empathy-event-manager.c:1155 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "సంకేతపదం అవసరం"
 
-#: ../src/empathy-event-manager.c:1211
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr ""
+msgstr "లో ఉన�నప�ప�డ�% s చూడండి అన�మతి కావాలన�క�ంట�న�నారని"
 
-#: ../src/empathy-event-manager.c:1215
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3848,6 +3930,10 @@ msgstr "\"%s\" యొక�క ఇంటిగ�రిటిని పరిశ
 msgid "Hashing \"%s\""
 msgstr "\"%s\" హాషింగ�"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "ఫైల�"
@@ -3869,8 +3955,7 @@ msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"దిగ�మతి చేయ�టక� � ఖాతాల� కన�గొనలేకపోయింది. ఎంపతి ప�రస�త�తం ఖాతాలన� పిడ�జిన� "
-"న�ండి దిగ�మతి చేయ�టక� "
+"దిగ�మతి చేయ�టక� � ఖాతాల� కన�గొనలేకపోయింది. ఎంపతి ప�రస�త�తం ఖాతాలన� పిడ�జిన� న�ండి దిగ�మతి చేయ�టక� "
 "మాత�రమే సహకరిస�త�ంది."
 
 #: ../src/empathy-import-dialog.c:199
@@ -3926,111 +4011,104 @@ msgid "Top up account credit"
 msgstr "టాప� అప� ఖాతా క�రెడిట�"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1046
 msgid "Top Up..."
 msgstr "టాప� అప�..."
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "చిర�నామా"
 
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "పరిచయమ�ల జాబితా"
 
-#: ../src/empathy-main-window.c:2287
-msgid "Show and edit accounts"
-msgstr "ఖాతాలన� చూపించ� మరియ� సవరించ�"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "పటమ� పై పరిచయాల� (_M)"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "క�రెడిట� బ�యాలెన�స�"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "పరిచయమ�ల జాబితాలో వెత�క� (_L)"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "ఇష�టాంశాలలో చేర� (_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "ఇష�టాంశాలన� నిర�వహించ�"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "సాధారణ పరిమాణమ� (_o)"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "కొత�త కాల�...(_C)"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "అవతారమ�లతో సాధారణ పరిమాణమ� (_A)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "ప�రాధాన�యతల� (_r)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "ప�రోటోకాల�స�న� చూపించ� (_r)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "పేర�ని బట�టి క�రమబద�దీకరించ� (_N)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "స�థితిని బట�టి క�రమబద�దీకరించ� (_S)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "ఖాతాల� (_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "నిరోధించబడిన పరిచయాల� (_O)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "పరిమాణమ�న� క�దించ� (_C)"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "డీబగ� (_D)"
-
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "ఫైల� బదిలీల� (_F)"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "చేర�...(_J)"
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "కొత�త సంభాషణ...(_N)"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "ఆఫ�‌లైన� పరిచయాల� (_O)"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "వ�యక�తిగత సమాచారమ� (_P)"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "గది (_R)"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "పరిచయాల కోసం వెత�క�...(_S)"
 
@@ -4077,17 +4155,14 @@ msgstr "గది జాబితాన� లోడ� చేయలేకపో
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"ఇక�కడ చేర�టక� గది పేర�న� ప�రవేశపెట�టండి లేదా జాబితాలోని ఒకటి లేదా ఎక�క�వ గద�ల "
-"పై నొక�కండి."
+msgstr "ఇక�కడ చేర�టక� గది పేర�న� ప�రవేశపెట�టండి లేదా జాబితాలోని ఒకటి లేదా ఎక�క�వ గద�ల పై నొక�కండి."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
-"గదికి ఆతిధ�యమిచ�చ� సేవకమ�న� ప�రవేశపెట�టండి, లేదా ఒకవేళ గది ప�రస�త�త ఖాతా "
-"సేవకమ�లో ఉంటే ఖాళీగా వదిలివేయండి"
+"గదికి ఆతిధ�యమిచ�చ� సేవకమ�న� ప�రవేశపెట�టండి, లేదా ఒకవేళ గది ప�రస�త�త ఖాతా సేవకమ�లో ఉంటే ఖాళీగా వదిలివేయండి"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
@@ -4101,79 +4176,79 @@ msgstr "గది జాబితా"
 msgid "_Room:"
 msgstr "గది (_R):"
 
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "సందేశం స�వీకరించబడింది"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "సందేశం పంపబడింది"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "కొత�త సంభాషణ"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "పరిచయం ఆన�‌లైన�‌క� వెళ�త�ంది"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "పరిచయం ఆఫ�‌లైన�క� వెళ�త�ంది"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "ఖాతా అన�సంధానించబడింది"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "ఖాతా అనన�సంధానించబడింది"
 
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "భాష"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
 msgstr "జూలియట�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
 msgstr "రోమియో"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "ఓ రోమియో, రోమియో, ఎక�కడ�న�నావ� రోమియో?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "నీ తండ�రి తిరస�కరించ� మరియ� నీ పేర� తిరస�కరించవచ�చ�;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "లేదా నీవ� విల�ట� లేకపోతే, కానీ నా ప�రేమ ప�రమాణ స�వీకారం"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "నేన� ఇకపై ఒక Capulet ఉంటాం."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "నేనింకా ఎక�క�వ వినాలా, లేక నేన� ఇక మాట�లాడవచ�చా?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
 msgstr "జూలియట� అనన�సంధానించింది"
 
-#: ../src/empathy-preferences.c:1131
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "ప�రాధాన�యతల�"
 
@@ -4181,144 +4256,159 @@ msgstr "ప�రాధాన�యతల�"
 msgid "Appearance"
 msgstr "కనిపించ�విధమ�"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "ప�రవర�తన"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "చాట� థీమ� (_e):"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "దూరంగా లేదాతీరికలేనప�ప�డ� ప�రకటనలన� అచేతనపర�చ� (_a)"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "దూరంగా లేదా తీరికలేనప�ప�డ� శబ�దమ�లన� అచేతనపర�చ� (_a)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "లోనికివచ�చ� ఘటనలన� ప�రకటిత ప�రాంతమ�లో చూపించ�"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"ప�రతిధ�వని రద�ద� ఇతర వ�యక�తి మీ వాయిస� ధ�వని స�వచ�చమైన చేయడానికి సహాయపడ�త�ంది, కానీ కొన�ని కంప�యూటర�లలో "
+"సమస�యల� కారణం కావచ�చ�. మీర� లేదా ఇతర వ�యక�తి కాల�స� సమయంలో వింత ధ�వన�లన� లేదా గ�లిట�చెస� వినడానికి ఉంటే, "
+"ప�రతిధ�వని రద�ద� ఆఫ� చెయ�యడానికి మరియ� కాల� మళ�ళీ ప�రారంభించడానికి ప�రయత�నించండి."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "పరిచయమ� ఆన�‌లైన�క� వచ�చినప�ప�డ� ప�రకటనలన� చేతనపర�చ�"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "పరిచయం ఆఫ�‌లైన�‌క� వెళ�ళినప�ప�డ� ప�రకటనలన� చేతనపర�చ�"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "చాట� పై దృష�టిసారించనప�ప�డ� ప�రకటనలన� చేతనపర�చ� (_c)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "ఈ భాషలక� అక�షరక�రమ తనిఖీచేయ�టని చేతనపర�చ�:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "సాధారణ"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "ఇన�ప�ట� స�థాయి:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "ఇన�ప�ట� పరిమాణం:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "స�థాన మూలాల�:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "సంభాషణల చిట�టా"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "ప�రకటనల�"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "ఘటనల కొరక� శబ�దమ�న� ప�లేచేయి"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "గోప�యత"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
-"స�థానమ� ఖచ�చితత�వమ�న� తగ�గించ�ట వలన మీ పట�టణమ�, రాష�ట�రమ� మరియ� దేశమ� కంటే "
-"ఎక�క�వ స�పష�టమ�గా "
+"స�థానమ� ఖచ�చితత�వమ�న� తగ�గించ�ట వలన మీ పట�టణమ�, రాష�ట�రమ� మరియ� దేశమ� కంటే ఎక�క�వ స�పష�టమ�గా "
 "ప�రచ�రించబడవ�.  GPS నిర�దేశకాల� ఖచ�చితమ�గా 1 డెసిమల� స�థానమ�నక� ఉంటాయి."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "చిర�నవ�వ�లన� బొమ�మల వలె చూపించ� (_s)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "గద�లలో పరిచయ జాబితాన� చూపించ� (_l)"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "శబ�దమ�ల�"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "అక�షరక�రమ తనిఖీ"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
-msgstr ""
-"మీర� � భాషలకైతే ఒక నిఘంట�వ�ని స�థాపించారో ఆ భాషల యొక�క జాబితా మాత�రమే "
-"ప�రతిబింబిస�త�ంది."
+msgstr "మీర� � భాషలకైతే ఒక నిఘంట�వ�ని స�థాపించారో ఆ భాషల యొక�క జాబితా మాత�రమే ప�రతిబింబిస�త�ంది."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "థీమ�ల�"
 
-#: ../src/empathy-preferences.ui.h:25
-#, fuzzy
+#: ../src/empathy-preferences.ui.h:30
 #| msgid "Theme Variant:"
 msgid "Variant:"
-msgstr "థీమ� రూపాంతరం:"
+msgstr "రూపాంతరం:"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "వ�యవస�థ ప�రారంభమయినప�డ� స�వయంచాలకంగా అన�సంధానమవ�వ� (_A)"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "సెల�‌ఫోన� (_C)"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "బ�డగ ప�రకటనలన� చేతనపర�చ� (_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "శబ�దప� ప�రకటనలన� చేతనపర�చ� (_E)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "నెట�‌వర�క� (IP, Wi-Fi) (_N)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "వేర�వేర� విండోలలో కొత�త చాట�‌లన� తెర�వ� (_O)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "స�థానమ�న� నా పరిచయమ�లక� ప�రచ�రించ� (_P)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "స�థానమ� ఖచ�చితత�వమ�న� తగ�గించ� (_R)"
 
@@ -4330,91 +4420,136 @@ msgstr "స�థితి"
 msgid "_Quit"
 msgstr "నిష�క�రమించ� (_Q)"
 
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "పరిచయానికి మళ�ళీ కాల� చేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "కెమెరా ఆప�"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "కెమెరా ఆన� చేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "కెమెరాన� అచేతనపర�చ� మరియ� వీడియోని పంప�ట ఆపివేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "కెమెరాన� చేతనపరిచి, వీడియోన� పంప�"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "కెమెరాన� చేతనపర�చ� కాని వీడియో పంపవద�ద�"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "మ�న�జూప�"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "తిరిగిడయిల�‌చేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "వీడియో (_i)"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "వీడియో ఆప�"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "వీడియో ఆన�‌చేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "వీడియో మ�న�జూప�"
+
 #: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "పరిచయ పటమ� వీక�షణ"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "భద�రపరచ�"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "దోషశ�ద�ది విండో"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "నిలిపివేయి"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "స�థాయి "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "దోషశ�ద�ది"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "సమాచారమ�"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "సందేశమ�"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "హెచ�చరిక"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "క�లిష�టమైన"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "దోషమ�"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "సమయం"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "డొమైన�"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "వర�గమ�"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "స�థాయి"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
-msgstr ""
-"ఎంచ�క�న�న అన�సంధాన నిర�వాహకమ� దూరస�థ దోషశ�ద�ధిచేసే పొడిగింప�క� సహకరించ�టలేద�."
+msgstr "ఎంచ�క�న�న అన�సంధాన నిర�వాహకమ� దూరస�థ దోషశ�ద�ధిచేసే పొడిగింప�క� సహకరించ�టలేద�."
 
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "భాగస�వామిని ఆహ�వానించ�"
 
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "సంభాషణలోకి ఆహ�వానించ�టక� ఒక పరిచయాన�ని ఎన�న�కోండి:"
 
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "ఆహ�వానించ�"
 
 #: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"� డైలాగ�లన� ప�రదర�శించవద�ద�; �దైనా పనిచేయి (ఉదా. దిగ�మతిచేయ�ట) మరియ� "
-"నిష�క�రమించ�"
+msgstr "� డైలాగ�లన� ప�రదర�శించవద�ద�; �దైనా పనిచేయి (ఉదా. దిగ�మతిచేయ�ట) మరియ� నిష�క�రమించ�"
 
 #: ../src/empathy-accounts.c:187
 msgid ""
@@ -4423,8 +4558,7 @@ msgstr "కేవలం \"దగà±�గరలోని à°µà±�యకà±�à°¤à±�à°²à±
 
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"ప�రాథమికంగా ఇచ�చిన ఖాతాన� ఎంచ�కొన� (ఉదా, gabble/jabber/foo_40example_2eorg0)"
+msgstr "ప�రాథమికంగా ఇచ�చిన ఖాతాన� ఎంచ�కొన� (ఉదా, gabble/jabber/foo_40example_2eorg0)"
 
 #: ../src/empathy-accounts.c:193
 msgid "<account-id>"
@@ -4438,7 +4572,16 @@ msgstr "- ఎంపతి ఖాతాల�"
 msgid "Empathy Accounts"
 msgstr "ఎంపతి ఖాతాల�"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "ఒక నిర�దిష�ట సేవ చూపించ�"
+
+#: ../src/empathy-debugger.c:75
+#| msgid "Empathy Debugger"
+msgid "- Empathy Debugger"
+msgstr "- తాదాత�మ�యం డీబగ�గర�"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "ఎంపతి దోష శ�ద�దిచేసేది"
 
@@ -4451,17 +4594,19 @@ msgid "Respond"
 msgstr "స�పందించ�"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "తిరస�కరించ�"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "సమాధానమివ�వ�"
 
 #: ../src/empathy-notifications-approver.c:227
 msgid "Answer with video"
-msgstr ""
+msgstr "వీడియో తో సమాధానం"
 
 #: ../src/empathy-notifications-approver.c:235
 #: ../src/empathy-notifications-approver.c:245
@@ -4473,37 +4618,76 @@ msgstr "నిరాకరించ�"
 msgid "Accept"
 msgstr "అంగీకరించ�"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "సమకూర�చ�"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
-msgstr ""
-"%s ఇప�ప�డే కాల� చేయడానికి ప�రయత�నించార�, కాని మీర� వేరే కాల� నంద� ఉన�నార�."
+msgstr "%s ఇప�ప�డే కాల� చేయడానికి ప�రయత�నించార�, కాని మీర� వేరే కాల� నంద� ఉన�నార�."
 
-#: ../src/empathy-call-window.c:1246
-#, fuzzy, c-format
-#| msgid "Call with %s"
-msgid "Call with %d participants"
-msgstr "%sతో కాల� చేయి"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr " నెన�"
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "లొ దచ�"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "నిశబ�దం"
+
+#: ../src/empathy-call-window.c:2780
+#| msgid "Location"
+msgid "Duration"
+msgstr "నిడివి"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2124
-#, fuzzy, c-format
+#: ../src/empathy-call-window.c:2783
+#, c-format
 #| msgid "Connected — %d:%02dm"
 msgid "%s — %d:%02dm"
-msgstr "అన�సంధానించబడింది — %d:%02dm"
-
-#: ../src/empathy-call-window.c:2125
-msgid "On hold"
-msgstr ""
+msgstr "%s — %d:%02dm"
 
-#: ../libempathy-gtk/empathy-search-bar.c:282
+#: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "సరిపోల� సందర�భం (_M)"
 
+#~ msgid "Find Next"
+#~ msgstr "తర�వాతది కన�గొన�"
+
+#~ msgid "Find Previous"
+#~ msgstr "మ�న�పటిది కన�గొన�"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "అన�రూపిత సందేశమ�న� ప�రవేశపెట�ట�"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "కొత�త స�థితి సందేశాన�ని భద�రపర�చ� (_N)"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "భద�రపర�చబడిన స�థితి సందేశాల�"
+
+#, fuzzy
+#~| msgid "Dialpad"
+#~ msgid "_Dialpad"
+#~ msgstr "డయల�‌ప�యాడ�"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "ఖాతాలన� చూపించ� మరియ� సవరించ�"
+
+#, fuzzy
+#~| msgid "Call with %s"
+#~ msgid "Call with %d participants"
+#~ msgstr "%sతో కాల� చేయి"
+
 #~ msgid "All"
 #~ msgstr "అన�ని"
 
@@ -4693,9 +4877,6 @@ msgstr "సరిపోల� సందర�భం (_M)"
 #~ msgid "Allow _network usage"
 #~ msgstr "నెట�వర�క� వినియోగమ�న� అన�మతించ�మ� (_n)"
 
-#~ msgid "Geoclue Settings"
-#~ msgstr "Geoclue అమరికల�"
-
 #~ msgid "Unable to start application for service %s: %s"
 #~ msgstr "సేవ %s కొరక� అన�వర�తనమ�న� ప�రారంభించలేద�: %s"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1f83f27e6..0a32f1cbe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,17 +15,18 @@
 # Tao Wang <dancefire@gmail.com>, 2010.
 # Dean Lee <xslidian@gmail.com>, 2010.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
-# Yinghua Wang <wantinghard@gmail.com>, 2010
+# Wylmer Wang <wantinghard@gmail.com>, 2010-2012.
 # zhen liu  <liuzhen1191@gmail.com>, 2011
+# Yangtse Su <yangtsesu@gmail.com>, 2011
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-11-24 11:51+0000\n"
-"PO-Revision-Date: 2011-11-25 21:46+0800\n"
-"Last-Translator: Yangtse Su <yangtsesu@gmail.com>\n"
+"POT-Creation-Date: 2012-02-15 21:22+0000\n"
+"PO-Revision-Date: 2012-02-14 13:52+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,468 +35,516 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "使用 Google Talk�Facebook�MSN 以�许多其它�天�务"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "�时通讯客户端"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy �时通讯程�"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "�时通讯客户端"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "使用 Google Talk�Facebook�MSN 以�许多其它�天�务"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "总是为新�天打开�独的�天窗�。"
+msgid "Connection managers should be used"
+msgstr "应该使用连接管�器"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "相机设备"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "是�使用连接管�器自动断开连接或�新连接。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "相机�置"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy �动时是�自动连接"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr "在群�中使用昵称补全时在昵称��添加的字符。"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy 是�在�动时自动登入您的��。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "�天窗�主题"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy 空闲时是�自动离开"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "�天窗�主题�生"
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Empathy 是�应在用户空闲时自动进入离开模�。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "用于拼写检查器的语言的列表，以逗�分隔(例如：en, fr, nl)。"
+msgid "Empathy default download folder"
+msgstr "Empathy 默认下载文件夹"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "紧凑显示�系人列表"
+msgid "The default folder to save file transfers in."
+msgstr "�存传�文件的默认文件夹。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "应该使用连接管�器"
+msgid "Show offline contacts"
+msgstr "显示离线�系人"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "�系人列表排��件"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "是�显示�系人清�中离线的�系人。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
+msgid "Show avatars"
+msgstr "显示头�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "视频呼�时默认使用的相机设备，例如 /dev/video0。"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "是�在�系人列表和�天窗�中显示头�。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "默认的选�头�图片的目录"
+msgid "Show protocols"
+msgstr "显示�议"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "离开时�用弹出�示"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "是�在�系人列表和�天窗�中显示�议。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "离开时�用声音"
+msgid "Show Balance in contact list"
+msgstr "在�系人列表中显示余�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "在状��显示呼入事件。"
+msgid "Whether to show account balances in the contact list."
+msgstr "是�在�系人列表和�天窗�中显示余�。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr "在状��显示呼入事件。如果为 false 则立�显示给用户。"
+msgid "Compact contact list"
+msgstr "紧凑显示�系人列表"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "回声抑制支�"
+msgid "Whether to show the contact list in compact mode."
+msgstr "是�以紧凑模�显示�系人列表。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy 能够�布用户的�置"
+msgid "Hide main window"
+msgstr "��主窗�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy 能够通过 GPS �估计�置"
+msgid "Hide the main window."
+msgstr "��主窗�。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy 能够通过手机�估计�置"
+msgid "Default directory to select an avatar image from"
+msgstr "默认的选�头�图片的目录"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy 能够通过网络�估计�置"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "上次选�头�图片的目录。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Empathy 默认下载文件夹"
+msgid "Open new chats in separate windows"
+msgstr "在�独窗�中打开新�天"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy 空闲时是�自动离开"
+msgid "Always open a separate chat window for new chats."
+msgstr "总是为新�天打开�独的�天窗�。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy �动时是�自动连接"
+msgid "Display incoming events in the status area"
+msgstr "在状��显示呼入事件。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "�低 Emapthy �置信�的准确度"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "在状��显示呼入事件。如果为 false 则立�显示给用户。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy 是�使用�系人头�作为�天窗�图标"
+msgid "The position for the chat window side pane"
+msgstr "�天窗�边�的�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "�用 WebKit 开�工具"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "�天窗�边��存的�置(�素)。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "�用新消�弹出�示"
+msgid "Show contact groups"
+msgstr "显示�系人分组"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "�用拼写检查器"
+msgid "Whether to show groups in the contact list."
+msgstr "是�在�系人列表中显示分组。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "��主窗�"
+msgid "Contact list sort criterion"
+msgstr "�系人列表排��件"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "��主窗�。"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"使用何��件�排��系人列表。默认情况下使用值“状��以按�系人状�排�。�值"
+"为“姓��时将按姓�排��系人列表。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "在加入�天室对�框中最�选择的��"
+msgid "Use notification sounds"
+msgstr "使用通知声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "昵称补全字符"
+msgid "Whether to play a sound to notify of events."
+msgstr "是�需�事件�示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "在�独窗�中打开新�天"
+msgid "Disable sounds when away"
+msgstr "离开时�用声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Adium 主题的路径"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "当离开或忙碌时是�使用声音�示。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "如果�天使用 Adium 主题，使用 Adium 主题的路径"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "收到消�时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "新对�时播放声音"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "是�需�消�到达�示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for outgoing messages"
 msgstr "�出消�时播放声音"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "是�为外出消�使用声音�示。"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "�系人登录时播放声音"
+msgid "Play a sound for new conversations"
+msgstr "新对�时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "�系人注销时播放声音"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "是�需�新会��示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "登录时播放声音"
+msgid "Play a sound when a contact logs in"
+msgstr "�系人登录时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "注销时播放声音"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "是�需��系人上线�示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "如果�天窗��是焦点则弹出消�通知"
+msgid "Play a sound when a contact logs out"
+msgstr "�系人注销时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "当�系人登录时弹出通知"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "是�需��系人下线�示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "当�系人注销时弹出通知"
+msgid "Play a sound when we log in"
+msgstr "登录时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "在通�时摄�头预览的�置。"
+msgid "Whether to play a sound when logging into a network."
+msgstr "当�网登录时是�播放�示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "在�系人列表中显示余�"
+msgid "Play a sound when we log out"
+msgstr "注销时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "显示头�"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "当网络断开时是�播放�示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "在�天室显示�系人列表"
+msgid "Enable popup notifications for new messages"
+msgstr "�用新消�弹出�示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "关闭主窗�时显示�示"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "当收到新消�时是�弹出显示�示框。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "显示离线�系人"
+msgid "Disable popup notifications when away"
+msgstr "离开时�用弹出�示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "显示�议"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "当离开或忙碌时是�弹出显示�示框。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "拼写检查器语言"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "如果�天窗��是焦点则弹出消�通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "�存传�文件的默认文件夹。"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr "如果�天窗�已开�，但�是当�窗�，接收新消�时是�弹出�示。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "上次选�头�图片的目录。"
+msgid "Pop up notifications when a contact logs in"
+msgstr "当�系人登录时弹出通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "�天窗�边�的�置"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "当�系人上线时是�显示弹出通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "�天窗�边��存的�置(�素)。"
+msgid "Pop up notifications when a contact logs out"
+msgstr "当�系人注销时弹出通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "用于在�天窗�中显示会�的主题。"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "当�系人离线时是�显示弹出通知。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "用于在�天窗�中显示会�的主题。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "使用表情图标"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "对�时是�将表情符�转�为表情图标。"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "使用通知声音"
+msgid "Show contact list in rooms"
+msgstr "在�天室显示�系人列表"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "为�天室使用主题"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "是�在�天室显示�系人列表。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "是��许 Empathy 将用户的�置共享给�系人"
+msgid "Chat window theme"
+msgstr "�天窗�主题"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "是��许 Empathy 通过 GPS 估计�置"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "用于在�天窗�中显示会�的主题。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "是��许 Empathy 通过手机网络估计�置"
+msgid "Chat window theme variant"
+msgstr "�天窗�主题�生"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "是��许 Empathy 通过网络估计�置"
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "用于在�天窗�中显示会�的主题。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Empathy 是�在�动时自动登入您的��。"
+msgid "Path of the Adium theme to use"
+msgstr "Adium 主题的路径"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Empathy 是�应在用户空闲时自动进入离开模�。"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "如果�天使用 Adium 主题，使用 Adium 主题的路径"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "是�出于��原因�低 Empathy �置信�的准确度。"
+msgid "Enable WebKit Developer Tools"
+msgstr "�用 WebKit 开�工具"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "是�使用�系人的头�作为�天窗�的图标。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "WebKit 开�工具，例如 Web Inspector 是�应该�用。"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Inform other users when you are typing to them"
+msgstr "告诉他人您正在输入"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "是�使用连接管�器自动断开连接或�新连接。"
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"是���“编写中�(composing)或“暂��(paused)的�天状�。目��影�“已离"
+"开�(gone)状�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "是�对您想�作拼写检查的��作拼写检查。"
+msgid "Use theme for chat rooms"
+msgstr "为�天室使用主题"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "对�时是�将表情符�转�为表情图标。"
+msgid "Whether to use the theme for chat rooms."
+msgstr "是�对�天室使用主题。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "是��用 Pulseaudio 的回声抑制过滤器。"
+msgid "Spell checking languages"
+msgstr "拼写检查器语言"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "是�需��系人上线�示音。"
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "用于拼写检查器的语言的列表，以逗�分隔(例如：en, fr, nl)。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "是�需��系人下线�示音。"
+msgid "Enable spell checker"
+msgstr "�用拼写检查器"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "是�需�事件�示音。"
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "是�对您想�作拼写检查的��作拼写检查。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "是�需�消�到达�示音。"
+msgid "Nick completed character"
+msgstr "昵称补全字符"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "是�需�新会��示音。"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "在群�中使用昵称补全时在昵称��添加的字符。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "是�为外出消�使用声音�示。"
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy 是�使用�系人头�作为�天窗�图标"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "当�网登录时是�播放�示音。"
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "是�使用�系人的头�作为�天窗�的图标。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "当网络断开时是�播放�示音。"
+msgid "Last account selected in Join Room dialog"
+msgstr "在加入�天室对�框中最�选择的��"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "当离开或忙碌时是�使用声音�示。"
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "最�选择加入�天室的��的 D-Bus 对象路径。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "当�系人离线时是�显示弹出通知。"
+msgid "Camera device"
+msgstr "相机设备"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "当�系人上线时是�显示弹出通知"
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "视频呼�时默认使用的相机设备，例如 /dev/video0。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr "如果�天窗�已开�，但�是当�窗�，接收新消�时是�弹出�示。"
+msgid "Camera position"
+msgstr "相机�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "当收到新消�时是�弹出显示�示框。"
+msgid "Position the camera preview should be during a call."
+msgstr "在通�时摄�头预览的�置。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "是�在�系人列表和�天窗�中显示余�。"
+msgid "Echo cancellation support"
+msgstr "回声抑制支�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "是�在�系人列表和�天窗�中显示头�。"
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "是��用 Pulseaudio 的回声抑制过滤器。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "是�显示�系人清�中离线的�系人。"
+msgid "Show hint about closing the main window"
+msgstr "关闭主窗�时显示�示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr "当离开或忙碌时是�弹出显示�示框。"
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr "当使用标题�中的“X�按钮关闭主窗�时是�显示�示对�框。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "是�在�系人列表和�天窗�中显示�议。"
+msgid "Empathy can publish the user's location"
+msgstr "Empathy 能够�布用户的�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "是�在�天室显示�系人列表。"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "是��许 Empathy 将用户的�置共享给�系人"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "是�以紧凑模�显示�系人列表。"
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy 能够通过网络�估计�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr "当使用标题�中的“X�按钮关闭主窗�时是�显示�示对�框。"
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "是��许 Empathy 通过网络估计�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "是�对�天室使用主题。"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy 能够通过手机�估计�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "是��许 Empathy 通过手机网络估计�置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy 能够通过 GPS �估计�置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "是��许 Empathy 通过 GPS 估计�置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "�低 Emapthy �置信�的准确度"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"使用何��件�排��系人列表。默认情况下使用值“姓��以按�系人姓�排�。�值"
-"为“状��时将按状�排��系人列表。"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "是�出于��原因�低 Empathy �置信�的准确度。"
 
+#. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2330
+msgid "Messaging and VoIP Accounts"
+msgstr "消�和 VoIP ��"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
 msgid "Manage Messaging and VoIP accounts"
 msgstr "管�消�和 VoIP ��"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2312
-msgid "Messaging and VoIP Accounts"
-msgstr "消�和 VoIP ��"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "未指定原因"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "需�状�改�信�"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "您�消了文件传输"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "�外的�与者�消了文件的传输"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "当传输这个文件的时候�生错误"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "�外的�与者无法传输这个文件"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "未知原因"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "文件传输完�，但该文件已��"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "文件传输�支�远程连接"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "所选文件是�正常的文件"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "所选文件是空的"
 
@@ -515,450 +564,394 @@ msgstr "与 %s 通�"
 msgid "Call from %s"
 msgstr "�电：%s"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "�支� Socket 类型"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "未指定原因"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "需�状�改�信�"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "您�消了文件传输"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "�外的�与者�消了文件的传输"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "当传输这个文件的时候�生错误"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "�外的�与者无法传输这个文件"
-
-#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "未知原因"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "在线"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "离开"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "�身"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "离线"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "状�已设置为离线"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "网络错误"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "验�失败"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "加密错误"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
-msgstr "用户�已�被�用"
+msgstr "用户�已被�用"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "未�供�书"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "�书�被信任"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "�书已过期"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "�书尚未激活"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "�书主机��匹�"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "�书指纹�匹�"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "�书是自签属的"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "�书错误"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "加密��用"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "�书无效"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "连接被拒�"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "无法建立连接"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "连接已丢失"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "该资�已被连接至�务器"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "该��已连接到�务器"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "连接已被使用相�资�的新连接�代"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "�务器上已存在该��"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "�务器太忙，无法处�当�连接"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "�书已被�销"
 
 # lainme：�书使用�安全的加密算法或是弱加密的
 # xslidian：�书使用的加密算法�安全或者易被破解
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "�书使用�安全的加密算法或者是弱加密的"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "�务器�书的长度——或�务器�书链的深度——超出了加密库的硬性�制"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "你的软件版本太旧了"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "内部错误"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook �天"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒钟�"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟�"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d �时�"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天�"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 星期�"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 月�"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "将�"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "全部��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c: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:776
-#: ../libempathy-gtk/empathy-account-widget.c:828
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1182
-msgid "My Web Accounts"
-msgstr "我的网络��"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1199
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s ��通过 %s 进行了编辑。"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1205
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s ��无法在 Empathy 中编辑。"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Launch My Web Accounts"
-msgstr "�动我的网络��"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1232
-#, c-format
-msgid "Edit %s"
-msgstr "编辑 %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1582
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "用户�："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1900
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "应用(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1930
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "登录(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "�务器上已存在该��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2007
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "在�务器上创建新的��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2201
-msgid "Ca_ncel"
-msgstr "�消(_N)"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2479
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 中的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2505
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s ��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2509
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "新建��"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>例如：</b> 我的�幕�称"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "密�(_W)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "高级"
+msgid "Screen _Name:"
+msgstr "用户�(_N)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>例如：</b> 我的�幕�称"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "密�(_W)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "记�密�"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "记�密�"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "端�(_P)："
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "记�密�"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "用户�(_N)："
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "�务器(_S)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "您的 AIM 密�是什么？"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "高级"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "您的 AIM �幕�称是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "端�(_P)："
+msgid "What is your AIM password?"
+msgstr "您的 AIM 密�是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "�务器(_S)："
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>例如：</b>用户�"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "记�密�"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "登录 I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>例如：</b>用户�"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "您的 GroupWise 用户�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "您的 GroupWise 密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN："
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>例如：</b>123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "字符集(_A):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN："
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "您的 ICQ UIN 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "您的 ICQ 密�是什么？"
 
@@ -995,24 +988,28 @@ msgstr "选项"
 msgid "None"
 msgstr "æ— "
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "网络"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "网络："
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "字符集："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "�务器"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
 msgstr "大多数 IRC �务器�需�密�，如果您�确定，则��输入密�。"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "网络"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "网络："
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "昵称："
@@ -1029,48 +1026,20 @@ msgstr "退出消�："
 msgid "Real name:"
 msgstr "真�："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "�务器"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "您的 IRC 昵称是什么?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "哪个 IRC 网络?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>例如：</b>user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>例如：</b>user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "需�加密(TLS/SSL)(_Y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "忽略 SSL �书错误(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "覆盖�务器设置"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "优先级(_T):"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "您的 IRC 昵称是什么?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "资�(_U)："
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "您的 Facebook 用户�是什么？"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1082,179 +1051,203 @@ msgstr ""
 "<b>badger</b>。如果您还没有 Facebook 用户�的�，使用<a href=\"http://www."
 "facebook.com/username/\">这个页�</a> �选择一个。"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "使用旧的 SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "您的 Facebook 密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "您的 Facebook 用户�是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "您的 Google ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>例如：</b>user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "您的 Google 密�是什么？"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>例如：</b>user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "忽略 SSL �书错误(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "优先级(_T):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "资�(_U)："
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "需�加密(TLS/SSL)(_Y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "使用旧的 SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "覆盖�务器设置"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "您的 Jabber ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "您的 Jabber 密�是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "您想�的 Jabber ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "您的 Jabber 密�是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "您想�的 Jabber 密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>例如：</b>user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "您的 Windows Live ��是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "您的 Windows Live 密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "电�邮件地�(_M):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "昵称(_K):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "姓(_L)："
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "�(_F)"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "公开的�字(_P)："
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID："
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "姓(_L)："
+msgid "E-_mail address:"
+msgstr "电�邮件地�(_M):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "公开的�字(_P)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "用户�(_U)："
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>例如：</b>user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "验�用户�："
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "�现绑定"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "自动�现 STUN �务器"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "用此��拨打固定电�和手机(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "忽略 TLS 错误"
+msgid "NAT Traversal Options"
+msgstr "NAT 选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "间隔(秒)"
+msgid "Proxy Options"
+msgstr "代�选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive 选项"
+msgid "Miscellaneous Options"
+msgstr "�项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "宽�路由"
+msgid "STUN Server:"
+msgstr "STUN �务器："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "机制："
+msgid "Discover the STUN server automatically"
+msgstr "自动�现 STUN �务器"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "�项"
+msgid "Discover Binding"
+msgstr "�现绑定"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT 选项"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "�务器："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive 选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "端�："
+msgid "Mechanism:"
+msgstr "机制："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "代�选项"
+msgid "Interval (seconds)"
+msgstr "间隔(秒)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "验�用户�："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "传输："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN �务器："
+msgid "Loose Routing"
+msgstr "宽�路由"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "�务器："
+msgid "Ignore TLS Errors"
+msgstr "忽略 TLS 错误"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "传输："
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "用此�户拨打固定电�和手机(_L)"
+msgid "Port:"
+msgstr "端�："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "您的 SIP ��密�是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "您的 SIP 登录 ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "用户�(_U)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "您的 SIP ��密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo I_D："
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "忽略会议和�天室邀请(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "�天室列表 locale(_R)："
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "您的 Yahoo! ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "您的 Yahoo! 密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo I_D："
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "�天室列表 locale(_R)："
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1317,62 +1310,62 @@ msgstr "�支�在此会�上进行紧急呼�"
 msgid "You don't have enough credit in order to place this call"
 msgstr "您信用�余��足以支付此次通�"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "建立�人对�失败"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "�支�在此会�上设置主题"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "您�能更改主题"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "%s 是无效的�系人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清空当�会�的所有消�"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主题>：设定当�对�的主题"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�天室�>：加入一个新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�天室�>：加入一个新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/用户[<�天室ID>] [<原因>]：当�默认离开�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <昵称> [<消�>]：打开一个�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <昵称> <消�>：打开一个�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <昵称>：在当��务器上改�您的昵称"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <动作消�>：�当�对�中��一个动作消�"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1381,131 +1374,137 @@ msgstr ""
 "/say <消�>：�� <消�> 到当�对�。这是用���一个“/�开始的信�。例如：“/"
 "say /join 是用�加入一个新的�天室�"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <�系人 ID>：显示一个�系人的信�"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 "/help [<命令>]：显示所有支�的命令。如果 <命令> 是有定义的，则显示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知命令，请使用 /help 查阅�用命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "余��足，无法��消�"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "��消�“%s�出错：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "��消�出错：%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "余��足，无法��消�。 <a href='%s'>充值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "��到"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "无效�系人"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "���足"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "消�太长"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "尚未实现"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "未知"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "�题："
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "�题被设置为：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "�题被 %s 设置为：%s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "未设置�题"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(没有建议)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "添加“%s�到字典"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "添加“%s�到 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "�入表情"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2437
 #: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "��(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2376
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "拼写建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "获�最近日志失败"
 
-#: ../libempathy-gtk/empathy-chat.c:2602
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已断开连接"
@@ -1513,12 +1512,12 @@ msgstr "%s 已断开连接"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出"
 
-#: ../libempathy-gtk/empathy-chat.c:2612
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1526,17 +1525,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s �止"
 
-#: ../libempathy-gtk/empathy-chat.c:2623
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被�止"
 
-#: ../libempathy-gtk/empathy-chat.c:2627
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离开了�天室"
@@ -1546,17 +1545,17 @@ msgstr "%s 离开了�天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2636
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2661
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 加入了�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2686
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在�� %s"
@@ -1564,90 +1563,90 @@ msgstr "%s 现在�� %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2847
+#: ../libempathy-gtk/empathy-chat.c:2993
 #: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "已断开连接"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3493
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "是��存密�?"
 
-#: ../libempathy-gtk/empathy-chat.c:3499
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "记录"
 
-#: ../libempathy-gtk/empathy-chat.c:3509
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "�是现在"
 
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "�试"
 
-#: ../libempathy-gtk/empathy-chat.c:3557
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "密�错误，请�试："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3687
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "这个房间是由一个密��护的："
 
-#: ../libempathy-gtk/empathy-chat.c:3714
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "加入"
 
-#: ../libempathy-gtk/empathy-chat.c:3902 ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "已连接"
 
-#: ../libempathy-gtk/empathy-chat.c:3957
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "对�"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3962
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (短信)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "未知或无效的识别符"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "�系人�蔽暂时��用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "�系人�蔽��用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "���足"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "无法�蔽�系人"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "编辑�蔽的�系人"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "��："
 
@@ -1657,7 +1656,7 @@ msgstr "已�蔽的�系人"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "删除"
@@ -1680,121 +1679,45 @@ msgstr "打开链接(_O)"
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "编辑�系人信�"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:338
-msgid "Personal Information"
-msgstr "个人信�"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:439
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新建�系人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:508
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "�蔽 %s？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:513
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "确定��蔽 %s 以阻止他�次�系您�？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:518
-#: ../libempathy-gtk/empathy-individual-dialogs.c:275
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "�蔽(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:536
-#: ../libempathy-gtk/empathy-individual-dialogs.c:284
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "举报�系人滥用"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "以��决定(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "订阅请求"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "�蔽用户(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../libempathy-gtk/empathy-individual-menu.c:1558
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "添加�系人(_A)..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:287
-msgid "_Block Contact"
-msgstr "�蔽�系人"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:316
-#: ../libempathy-gtk/empathy-individual-menu.c:789
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "�天(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:348
-#: ../libempathy-gtk/empathy-individual-menu.c:881
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "音频呼�(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:381
-#: ../libempathy-gtk/empathy-individual-menu.c:926
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "视频呼�(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:427
-#: ../libempathy-gtk/empathy-individual-menu.c:979
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "最近会�(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:449
-#: ../libempathy-gtk/empathy-individual-menu.c:1020
-msgid "Send File"
-msgstr "��文件"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:472
-#: ../libempathy-gtk/empathy-individual-menu.c:1062
-msgid "Share My Desktop"
-msgstr "共享我的桌�"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-#: ../libempathy-gtk/empathy-individual-menu.c:1125
-msgid "Infor_mation"
-msgstr "信�(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:601
-#: ../libempathy-gtk/empathy-individual-menu.c:1316
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "邀请到此�天室"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:632
-#: ../libempathy-gtk/empathy-individual-menu.c:1362
-msgid "_Invite to Chat Room"
-msgstr "邀请到�天室(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "以��决定(_L)"
 
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
@@ -1821,166 +1744,170 @@ msgstr "您的自我介�信�："
 msgid "Please let me see when you're online. Thanks!"
 msgstr "你在线时请让我知�，谢谢�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:571
+#: ../libempathy-gtk/empathy-contact-widget.c:569
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "频�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-contact-widget.c:749
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "包括 ISO 编�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-contact-widget.c:751
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "国家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-contact-widget.c:753
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-contact-widget.c:755
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "城市："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:757
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "地区："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-contact-widget.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "邮政编�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-contact-widget.c:761
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "街�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-contact-widget.c:763
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "建筑物："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-contact-widget.c:765
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "楼层："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-contact-widget.c:767
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "房间："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-contact-widget.c:769
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "文本："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-contact-widget.c:771
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "�述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-contact-widget.c:773
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:775
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "准确程度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:777
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "错误："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-contact-widget.c:779
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "垂直误差(米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-contact-widget.c:781
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "水平误差(米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-contact-widget.c:783
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-contact-widget.c:785
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "方���："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-contact-widget.c:787
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "爬�速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:789
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "最近更新于："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-contact-widget.c:791
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "�度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-contact-widget.c:793
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "纬度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:797
+#: ../libempathy-gtk/empathy-contact-widget.c:795
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "海拔："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "�置"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:865
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:917
 #: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y 于 %R UTC 时间"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "�存头�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1057
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "无法�存头�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1745
-#: ../libempathy-gtk/empathy-individual-menu.c:1097
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
-msgid "Favorite"
-msgstr "收�"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "个人详情"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "�系人详情"
 
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
@@ -2047,176 +1974,216 @@ msgstr "邮政"
 msgid "parcel"
 msgstr "邮件"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>�置</b>于(日期）\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "标识符："
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "别�："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "客户端信�"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "客户端："
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>�置</b>于(日期）\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "�系人详情"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "已��信�请求..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
-msgid "Identifier:"
-msgstr "标识符："
+msgid "Client Information"
+msgstr "客户端信�"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "已��信�请求..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "�作系统："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "版本："
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "客户端："
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "组"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "选择您想将该�系人加入的群组。注�您�以选择多个群组，也�以�选择。"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "添加群组(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "选择"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1952
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "群组"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:258
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "以下用户将被�蔽："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "以下用户无法被�蔽："
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "已绑定的�系人"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "选择�绑定的�系人"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "新�系人预览"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "在左侧列表中选中的�系人将被绑定在一起。"
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "编辑�系人信�"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:148
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
-msgstr "选择�用于拨打电�的�户"
+msgstr "选择�用于拨打电�的��"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:316
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "通�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:381
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "手机"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:383
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "办公"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:385
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "家庭"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "�蔽�系人"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "�天(_C)"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:836
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "短信(_S)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1174
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "音频呼�(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "视频呼�(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "最近会�(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "��文件"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "共享我的桌�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "收�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts 未安装"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "请安装 gnome-contacts �访问�系人详情。"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "信�(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1200
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "绑定�系人(_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1175
+msgid "Inviting you to this room"
+msgstr "邀请到此�天室"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "邀请到�天室(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "添加�系人(_A)..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2362
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "删除并�蔽(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "您真的�删除群组“%s��？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2400
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "删除群组"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2455
-#: ../libempathy-gtk/empathy-individual-view.c:2672
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2532
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "您真的想�删除�系人“%s��？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2541
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2224,11 +2191,11 @@ msgid ""
 msgstr ""
 "您是�真正地想�删除已绑定的�系人'%s' ？ 注�这将删除所有�系已绑定的�系人"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2553
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "删除�系人"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2238,23 +2205,23 @@ msgstr[0] "已绑定�系人包� %u �系人"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>�置</b> 于 (日期)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "通过电�或移动设备上网"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "新建网络"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "选择一个 IRC 网络"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "�置_Networks列表"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "选择"
@@ -2267,308 +2234,246 @@ msgstr "新建�务器"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "绑定�系人"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "解除绑定(_U)..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "完全分离已显示的绑定的�系人�为�独的�系人"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "绑定(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "解除已绑定的�系人 %s？"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"您确定您�接触这些已绑定的�系人？这将会完全拆分已绑定的�系人为�独的�系"
-"人。"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "解除绑定(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:621
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "历�"
 
-#: ../libempathy-gtk/empathy-log-window.c:676
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "显示"
 
-#: ../libempathy-gtk/empathy-log-window.c:698
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "�索"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "在 %s �天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1149
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "与 %s �天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1199
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y年%m月%d日 %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1288
+#: ../libempathy-gtk/empathy-log-window.c: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:1294
+#: ../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:1370
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通�时长：%s，结�于 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1719
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "今天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1723
+#: ../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:1738
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1826
-#: ../libempathy-gtk/empathy-log-window.c:3458
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "�时"
 
-#: ../libempathy-gtk/empathy-log-window.c:1915
-#: ../libempathy-gtk/empathy-log-window.c:2371
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../libempathy-gtk/empathy-log-window.c:2684
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "è°�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2893
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "何时"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3011
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "文本�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:3013
-#: ../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:3018
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "�电"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "呼出的语音通�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3020
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "未接�电"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "什么事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../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:3755
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "全部清除"
 
-#: ../libempathy-gtk/empathy-log-window.c:3762
+#: ../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 "文件(_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "�天"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "编辑(_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "清空全部历�..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "个人信�"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "视频"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "�天"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "编辑(_E)"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "视频"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "文件(_F)"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "第 2 页"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
-#, fuzzy
-#| msgid "The specified contact is offline"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">正在载入...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
-msgstr "选择的�系人离线"
+msgstr "�系人为离线"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
-#, fuzzy
-#| msgid "The specified contact is not valid"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
-msgstr "选择的�系人无效"
+msgstr "指定的�系人无效或信�未知"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "选择的�系人�支�在该类型会�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "所�求的功能与此�议�兼容"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "无法与选择的�系人�起对�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "您已被此频��蔽"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "频�已满"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
-#, fuzzy
-#| msgid "You have been invited to join %s"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
-msgstr "您被邀请加入 %s"
+msgstr "您必须被邀请�能加入此频�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
-#, fuzzy
-#| msgid "Contact disconnected"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
-msgstr "�系人已断开"
+msgstr "断开时无法进行"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
-#, fuzzy
-#| msgid "permission denied"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
-msgstr "���足"
+msgstr "拒�访问"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
-#, fuzzy
-#| msgid "There was an error starting the call"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
-msgstr "�起呼�时出错"
+msgstr "�起对�时出错"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
 msgid "Enter a contact identifier or phone number:"
 msgstr "输入一个�系人标识或电���："
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "新建对�"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
-#, fuzzy
-#| msgctxt "menu item"
-#| msgid "_Video Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "_Video Call"
 msgstr "视频呼�(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
-#, fuzzy
-#| msgctxt "menu item"
-#| msgid "_Audio Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
 msgid "_Audio Call"
 msgstr "音频呼�(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "新建通�"
 
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:130
-#, fuzzy, c-format
-#| msgid "Authentication failed"
+#, c-format
 msgid "Authentification failed for account <b>%s</b>"
-msgstr "验�失败"
+msgstr "�� <b>%s</b> 验�失败"
 
 #: ../libempathy-gtk/empathy-base-password-dialog.c:224
 #: ../libempathy-gtk/empathy-password-dialog.c:134
@@ -2598,11 +2503,11 @@ msgstr "编辑自定义消�"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
-msgstr "点击移除自定义状�"
+msgstr "点击移除常用自定义状�"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
-msgstr "点击设置自定义状�"
+msgstr "点击设置常用自定义状�"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
@@ -2627,20 +2532,20 @@ msgid "Find:"
 msgstr "查找："
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "区分大�写(_C)"
+msgid "_Previous"
+msgstr "上一页(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "未找到短语"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "下一页(_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "区分大�写(_C)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "上一页(_P)"
+msgid "Phrase not found"
+msgstr "未找到短语"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2684,14 +2589,14 @@ msgstr "语音通�结�"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
-msgstr "编辑自定义状�"
+msgstr "编辑自定义消�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "消�于 %s 被编辑"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "普通"
 
@@ -2767,18 +2672,22 @@ msgid "Certificate hostname: %s"
 msgstr "�书主机�: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "继续"
+msgid "C_ontinue"
+msgstr "继续(_O)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "��信任的连接"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "连接��信任。是���继续?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "为将�的连接记�本次选择"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "�书详情"
 
@@ -2973,31 +2882,31 @@ msgstr "西方语言"
 msgid "Vietnamese"
 msgstr "越�语"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "无错误信�"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "�时消�(Empathy)"
 
-#: ../src/empathy.c:433
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "�动时�自动连接"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�动时�显示�系人列表"
 
-#: ../src/empathy.c:452
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr " - Empathy �时通讯客户端"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "�系��管�器出错"
 
-#: ../src/empathy.c:641
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3039,11 +2948,11 @@ msgstr ""
 "给自由软件基金会写信。地�是：51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "一个 GNOME �时消�客户端"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Abel Cheung <maddog@linux.org.hk>, 2003\n"
@@ -3093,38 +3002,39 @@ msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
-"您�以返回�试�新输入您的��信�，或者退出助�，然�从编辑��中加入�户。"
+"您�以返回�试�新输入您的��信�，或者退出助�，然�从编辑��中加入��。"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1272
+#: ../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 "
@@ -3135,41 +3045,41 @@ msgstr ""
 "Live 和许多其它�天软件的朋�和�事�天。使用麦克风或摄�头，您就�以开始音频"
 "和视频通�。"
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "您有没有其它�天软件的��？"
 
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "有，请导入我的��信�"
 
-#: ../src/empathy-account-assistant.c:674
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "有，我现在就输入我的��信�"
 
-#: ../src/empathy-account-assistant.c:696
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "�，我想�一个新的��"
 
-#: ../src/empathy-account-assistant.c:706
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "没有，我�是想看看附近现在�在线上"
 
-#: ../src/empathy-account-assistant.c:727
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "选择您�导入的��："
 
-#: ../src/empathy-account-assistant.c:814
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../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:821
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "没有，就这样�"
 
-#: ../src/empathy-account-assistant.c:1086
+#: ../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 "
@@ -3180,16 +3090,16 @@ msgstr ""
 "想使用这个功能，请仔细查看下列信�是�正确。您之�也�以通过“���对�框轻�"
 "的修改这些信�或关闭这个功能"
 
-#: ../src/empathy-account-assistant.c:1092
-#: ../src/empathy-account-assistant.c:1148
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1152
 msgid "Edit->Accounts"
 msgstr "编辑->��"
 
-#: ../src/empathy-account-assistant.c:1108
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
 msgstr "暂��用此特性(_N)"
 
-#: ../src/empathy-account-assistant.c:1144
+#: ../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 "
@@ -3200,98 +3110,108 @@ msgstr ""
 "用该功能，请安装 telepathy-salut 包，并且在��对�框中创建附近的人(People "
 "Nearby)��"
 
-#: ../src/empathy-account-assistant.c:1150
+#: ../src/empathy-account-assistant.c:1154
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut 未安装"
 
-#: ../src/empathy-account-assistant.c:1196
+#: ../src/empathy-account-assistant.c:1200
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "消�和 VoIP ��助手"
 
-#: ../src/empathy-account-assistant.c:1230
+#: ../src/empathy-account-assistant.c:1234
 msgid "Welcome to Empathy"
 msgstr "欢迎使用 Empathy"
 
-#: ../src/empathy-account-assistant.c:1239
+#: ../src/empathy-account-assistant.c:1243
 msgid "Import your existing accounts"
 msgstr "导入现有��"
 
-#: ../src/empathy-account-assistant.c:1257
+#: ../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-accounts-dialog.c:347
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "正在连接..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "离线 - %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已断开 - %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "离线 - 无�用网络"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "未知状�"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
 msgstr "离线 - ��被�用"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr "您将�创建一个新��，所�的修改将作废。您确定�继续�？"
+#: ../src/empathy-accounts-dialog.c:533
+msgid "Edit Connection Parameters"
+msgstr "编辑连接�数"
+
+#: ../src/empathy-accounts-dialog.c:696
+msgid "Failed to retrieve your personal information from the server."
+msgstr "从�务器获�您的个人信�失败。"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:702
+msgid "Go online to edit your personal information."
+msgstr "请上线以编辑您的个人信�。"
+
+#: ../src/empathy-accounts-dialog.c:787
+msgid "_Edit Connection Parameters..."
+msgstr "编辑连接�数(_E)..."
+
+#: ../src/empathy-accounts-dialog.c:1292
 #, 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:1296
 msgid "This will not remove your account on the server."
 msgstr "这�会删除�务器上的��。"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1532
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "您将�选择�一个��，所�的修改将作废。您确定�继续�？"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1708
 msgid "_Enable"
 msgstr "�用(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1709
 msgid "_Disable"
 msgstr "�用(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2179
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3301,33 +3221,33 @@ msgstr "您将�关闭此窗�，所�的修改将作废。您确定�继续
 msgid "Add…"
 msgstr "添加..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "正在加载账�信�"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "尚未安装�议"
+msgid "_Import…"
+msgstr "导入(_I)..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "�议："
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "�添加一个新��，您首先需�为您想�使用的�个�议安装�端。"
 
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "尚未安装�议"
+
 #: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "导入(_I)..."
+msgid "Loading account information"
+msgstr "正在加载��信�"
 
-#: ../src/empathy-auth-client.c:284
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Empathy 认�客户端"
 
-#: ../src/empathy-auth-client.c:300
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy 认�客户端"
 
@@ -3335,11 +3255,11 @@ msgstr "Empathy 认�客户端"
 msgid "People nearby"
 msgstr "附近的人"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy 语音/视频客户端"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 语音/视频客户端"
 
@@ -3382,33 +3302,33 @@ msgstr "详细信�"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "与 %s 通�"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "机器所�的 IP 地�"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internet 上�务器所�的 IP 地�"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "�一方所�的 IP 地�"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "中转�务器 IP 地�"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "多播组的 IP 地�"
 
@@ -3416,8 +3336,6 @@ msgstr "多播组的 IP 地�"
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
 #: ../src/empathy-streamed-media-window.c:1847
-#, fuzzy
-#| msgid "Unknown"
 msgctxt "codec"
 msgid "Unknown"
 msgstr "未知"
@@ -3429,12 +3347,12 @@ msgid "Connected — %d:%02dm"
 msgstr "已连接 — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "技术细节"
 
 #: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3442,7 +3360,7 @@ msgid ""
 msgstr "%s 软件无法�解您计算机所支�的任何音频格�。"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3450,7 +3368,7 @@ msgid ""
 msgstr "%s 软件无法�解您计算机所支�的任何视频格�。"
 
 #: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3458,24 +3376,24 @@ msgid ""
 msgstr "�能与 %s 建立连接。�能是两�计算机之一��许直接连接。"
 
 #: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "网络出现一个错误"
 
 #: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-call-window.c:3100
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "呼�所需�的音频格�还没有在您的电脑上安装"
 
 #: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-call-window.c:3103
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "呼�所需�的视频格�还没有在您的电脑上安装"
 
 #: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3486,256 +3404,297 @@ msgstr ""
 "�里“调试�窗�收集到的日志。"
 
 #: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "呼�引擎里出现了一个故障"
 
 #: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "已到达�的末尾"
 
 #: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "�能建立音频�"
 
 #: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "�能建立视频�"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "音频"
+msgid "_Call"
+msgstr "通�(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "解�器："
+msgid "_Microphone"
+msgstr "�筒(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "�用相机"
+msgid "_Camera"
+msgstr "相机(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "显示拨�盘"
+msgid "_Settings"
+msgstr "设置(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "编�器："
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "查看(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "挂起"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "帮助(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "挂起当�呼�"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "内容(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "本地候选："
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "调试(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "最大化我"
+msgid "Swap camera"
+msgstr "交�相机"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "最�化我"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "远程候选："
+msgid "Maximise me"
+msgstr "最大化我"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "��音频"
+msgid "Disable camera"
+msgstr "�用相机"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "��视频"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "挂断"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "显示拨�盘"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "挂断当�呼�"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "视频呼�"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "开始视频通�"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "开始音频通�"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "交�相机"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "切�音频传输"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "切�视频传输"
+msgid "Show dialpad"
+msgstr "显示拨�盘"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "未知"
+msgid "Display the dialpad"
+msgstr "显示拨�盘"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "��视频"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "视频呼�"
+msgid "Toggle video transmission"
+msgstr "切�视频传输"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "通�(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "��音频"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "相机(_C)"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "内容(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "切�音频传输"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "调试(_D)"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "编�器："
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "帮助(_H)"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "解�器："
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "�筒(_M)"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "远程候选："
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "设置(_S)"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "本地候选："
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "查看(_V)"
+msgid "Audio"
+msgstr "音频"
+
+#: ../src/empathy-chat-window.c:285
+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 间�天室。您将�会�收到任何消�，除��新加入。"
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+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 "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)"
 msgstr[0] "%s (%d 未读)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (和�外 %u 人)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (�有他人的 %d �未读)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (所有人共 %d �未读)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:888
 msgid "SMS:"
 msgstr "短信："
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:898
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在�� %d �消�"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
 msgstr "输入消�。"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "清除(_L)"
+msgid "_Conversation"
+msgstr "对�(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "�系人(_O)"
+msgid "C_lear"
+msgstr "清除(_L)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "�入表情(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "收��天室(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "邀请�与者(_P)…"
+msgid "Notify for All Messages"
+msgstr "�示所有消�"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "左移标签(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "显示�系人列表(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "�移标签(_R)"
+msgid "Invite _Participant…"
+msgstr "邀请�与者(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "�示所有消�"
+msgid "C_ontact"
+msgstr "�系人(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "对�(_C)"
+msgid "_Tabs"
+msgstr "标签(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "漂移标签(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "收��天室(_F)"
+msgid "_Previous Tab"
+msgstr "上一标签(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "下一标签(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "上一标签(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "撤销关闭标签(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "显示�系人列表(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "左移标签(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "标签(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "�移标签(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "撤销关闭标签(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "漂移标签(_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3749,100 +3708,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:1555
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
 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:1561
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的�电"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "拒�(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "接�(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "使用视频接�(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%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 "拒�(_D)"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../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:1145 ../src/empathy-main-window.c:377
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "需�密�"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../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:1214
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3852,105 +3811,105 @@ msgstr ""
 "消�：%s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%2$s 中的 %1$s，速度 %3$s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%2$s 中的 %1$s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "正在从 %2$s 接收 \"%1$s\""
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "正在� %2$s �� \"%1$s\""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "从 %2$s 接收 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "接收文件出错"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "� %2$s �� \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "��文件出错"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "已�从 %2$s 完�接收 \"%1$s\""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "已�� %2$s 完��� \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "文件传�完�"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他�与者的回应"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "检查\"%s\"完整性"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "校验中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "文件"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "剩余"
 
@@ -3966,170 +3925,185 @@ msgstr "从列表移除已完��已�消�已失败的文件传输"
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
-msgstr "未找到�导入的��。Empathy 目��能支�从 Pidgin 导入�户。"
+msgstr "未找到�导入的��。Empathy 目��能支�从 Pidgin 导入��。"
 
 #: ../src/empathy-import-dialog.c:199
 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:394
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "�供密�"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "已断开连接"
 
-#: ../src/empathy-main-window.c:637
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "您需�设置一个���能查看这里的�系人。"
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "没有找到匹�项"
 
-#: ../src/empathy-main-window.c:745
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
-msgstr "很抱歉，在软件 %2$s 更新�，您�能使用 %1$s �户。"
+msgstr "很抱歉，在软件 %2$s 更新�，您�能使用 %1$s ��。"
 
-#: ../src/empathy-main-window.c:813
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "�级软件"
 
-#: ../src/empathy-main-window.c:819 ../src/empathy-main-window.c:940
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "关闭"
 
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "�新连接"
 
-#: ../src/empathy-main-window.c:934
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "编辑��"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1073
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "给 %s 充值(%s)..."
 
-#: ../src/empathy-main-window.c:1120
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
-msgstr "�户充值"
+msgstr "��充值"
 
 #. top up button
-#: ../src/empathy-main-window.c:1191
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "充值..."
 
-#: ../src/empathy-main-window.c:1934
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "�系人"
 
-#: ../src/empathy-main-window.c:2309
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "您需��用一个���能查看这里的�系人。"
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "您需��用 %s �查看这里的�系人。"
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "�系人列表"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "�系人地图(_M)"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "��设置"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "�户余�"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "新建对�(_N)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "在�系人列表中查找(_L)"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "新建呼�(_C)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "加入已收�的�天室(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "�索�系人(_S)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "管�收�夹"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "文件传输(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "常规视图(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "离线�系人(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "新建呼�(_C)..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "显示�议(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "扩展视图(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "��余�"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "�系人地图(_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "��(_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "已�蔽的�系人(_B)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "首选项(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "显示�议(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "在�系人列表中查找(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "按姓�排�(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "按状�排�(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "��(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "扩展视图(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "已�蔽的�系人(_B)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "常规视图(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "紧凑视图(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "文件传输(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "�天室(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "加入(_J)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "新建对�(_N)..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "离线�系人(_O)"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "个人信�(_P)"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "�天室(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "加入已收�的�天室(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "�索�系人(_S)..."
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "管�收�夹"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4141,7 +4115,7 @@ msgstr "�员"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4154,22 +4128,22 @@ msgstr ""
 "需�密�: %s\n"
 "�员: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "�"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "无法开始�天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "无法�止�天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "无法载入�天室列表"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "加入�天室"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4177,23 +4151,23 @@ msgid ""
 msgstr "输入�天室�以加入或在列表中点击一个或多个�天室。"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "�天室(_R)："
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr "输入�天室所在的�务器，或为空表示�天室在当���的�务器上。"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "加入�天室"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "无法载入�天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "�天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "�天室(_R)："
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "收到了消�"
@@ -4207,12 +4181,12 @@ msgid "New conversation"
 msgstr "新对�"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
-msgstr "离线人上线"
+msgid "Contact comes online"
+msgstr "�系人上线了"
 
 #: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
-msgstr "�系人离线"
+msgstr "�系人离线了"
 
 #: ../src/empathy-preferences.c:171
 msgid "Account connected"
@@ -4227,260 +4201,268 @@ msgid "Language"
 msgstr "语言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "朱立�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "罗密欧"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "朱立�已断开连接"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "首选项"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "显示表情符�为图形(_S)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "在�天室显示�系人列表(_L)"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "外观"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "行为"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "�天开始于："
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "�天主题(_E)："
+msgid "new ta_bs"
+msgstr "新标签(_B)"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "离开或忙碌时�用�示(_A)"
+msgid "new _windows"
+msgstr "新窗�(_W)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "离开或忙碌时�用声音(_A)"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "��示区域显示呼入事件"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "�动时自动连接(_A) "
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"回声消除�以使您的语音在对方��更清晰，但在�些计算机上�能导致问题。如果您"
-"或对方在通�时�到了奇怪的噪音或怪音，请�试关闭回声消除并�新通�。"
+msgid "Log conversations"
+msgstr "记录对�"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "当�系人上线时�许�示"
+msgid "Behavior"
+msgstr "行为"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "当�系人离线时�许�示"
+msgid "General"
+msgstr "常规"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "当会�闲置时�许�示"
+msgid "_Enable bubble notifications"
+msgstr "�许气泡通知(_E)"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "�许拼写检查的语言："
+msgid "Disable notifications when _away or busy"
+msgstr "离开或忙碌时�用�示(_A)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "常规"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "当会�闲置时�许�示"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "当�系人上线时�许�示"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "�置��："
+msgid "Enable notifications when a contact goes offline"
+msgstr "当�系人离线时�许�示"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "记录对�"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "�示"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "�用声音通知(_E)"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "播放事件声音"
+msgid "Disable sounds when _away or busy"
+msgstr "离开或忙碌时�用声音(_A)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "��"
+msgid "Play sound for events"
+msgstr "播放事件声音"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"�低定�精度�味�比您所在的城市�州和国家更明确的信�将�会被公布。 GPS �标"
-"将精确到一��数。 "
+msgid "Sounds"
+msgstr "声音"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "显示表情符�为图形(_S)"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "使用回声抑制，以改善通�质�"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "在�天室显示�系人列表(_L)"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "声音"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "拼写检查"
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"回声消除�以使您的语音在对方��更清晰，但在�些计算机上�能导致问题。如果您"
+"或对方在通�时�到了奇怪的噪音或怪音，请�试关闭回声消除并�新通�。"
 
 #: ../src/empathy-preferences.ui.h:26
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "语言列表仅�映已安装的字典"
+msgid "_Publish location to my contacts"
+msgstr "�我的�系人公布�置信�(_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "主题"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "使用回声抑制，以改善通�质�"
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"�低定�精度�味�比您所在的城市�州和国家更明确的信�将�会被公布。 GPS �标"
+"将精确到一��数。 "
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Variant:"
-msgstr "版本："
+msgid "_Reduce location accuracy"
+msgstr "�低�置信�精度(_R)"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "�动时自动连接(_A) "
+msgid "Privacy"
+msgstr "��"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "手机(_C)"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "�许气泡通知(_E)"
+msgid "_Cellphone"
+msgstr "手机(_C)"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "�用声音通知(_E)"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "网络(_N)(IP，Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "�置��："
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "在�独窗�中打开新�天(_O)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "语言列表仅�映已安装的字典"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "�我的�系人公布�置信�(_P)"
+msgid "Enable spell checking for languages:"
+msgstr "�许拼写检查的语言："
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "拼写检查"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Reduce location accuracy"
-msgstr "�低�置信�精度(_R)"
+msgid "Chat Th_eme:"
+msgstr "�天主题(_E)："
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "版本："
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "主题"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "状�"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "�次呼��系人"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "相机关闭"
+msgid "Redial"
+msgstr "�拨"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "相机开�"
+msgid "V_ideo"
+msgstr "视频(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "视频关闭"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "�用相机�止��视频"
+msgid "Video Preview"
+msgstr "视频预览"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "�用相机，并��视频"
+msgid "Video On"
+msgstr "视频开�"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "�用相机，但���视频"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "�次呼��系人"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "预览"
+msgid "Camera Off"
+msgstr "相机关闭"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "�拨"
+msgid "Disable camera and stop sending video"
+msgstr "�用相机�止��视频"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "视频(_I)"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "预览"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "视频关闭"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "�用相机，但���视频"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "视频开�"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "相机开�"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "视频预览"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "�用相机，并��视频"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "�系地图视图"
 
@@ -4546,16 +4528,16 @@ msgid ""
 "extension."
 msgstr "已选定的连接管��支�远程调试扩展"
 
-#: ../src/empathy-invite-participant-dialog.c:197
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "邀请�与者"
 
-#: ../src/empathy-invite-participant-dialog.c:198
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "选择一个�系人以加入该会�："
 
-#: ../src/empathy-invite-participant-dialog.c:221
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "邀请"
 
@@ -4578,10 +4560,8 @@ msgid "<account-id>"
 msgstr "<�� ID>"
 
 #: ../src/empathy-accounts.c:196
-#, fuzzy
-#| msgid "Show the accounts dialog"
 msgid "Show account assistant"
-msgstr "显示��对�框"
+msgstr "显示��助手"
 
 #: ../src/empathy-accounts.c:202
 msgid "- Empathy Accounts"
@@ -4603,7 +4583,7 @@ msgstr "- Empathy 调试器"
 msgid "Empathy Debugger"
 msgstr "Empathy 调试器"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr " - Empathy IM 客户端"
 
@@ -4612,13 +4592,13 @@ msgid "Respond"
 msgstr "�应"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "拒�"
 
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "接�"
 
@@ -4650,38 +4630,38 @@ msgstr "%s 刚刚�试呼�您，但您当时正在与其他人通�。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "挂起"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "�音"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "时长"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3214
 #, c-format
 msgid "Your current balance is %s."
 msgstr "您当�的余�为 %s。"
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3218
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "对�起，您信用�余��足以支付此次通�。"
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3220
 msgid "Top Up"
 msgstr "充值"
 
@@ -4689,6 +4669,93 @@ msgstr "充值"
 msgid "_Match case"
 msgstr "区分大�写(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "添加新��"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "�支� Socket 类型"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "我的网络��"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s ��通过 %s 进行了编辑。"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s ��无法在 Empathy 中编辑。"
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "�动我的网络��"
+
+#~ msgid "Edit %s"
+#~ msgstr "编辑 %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "�消(_N)"
+
+#~ msgid "Personal Information"
+#~ msgstr "个人信�"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "编辑(_E)"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "已绑定的�系人"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "选择�绑定的�系人"
+
+#~ msgid "New contact preview"
+#~ msgstr "新�系人预览"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "在左侧列表中选中的�系人将被绑定在一起。"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "绑定�系人(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "绑定�系人"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "解除绑定(_U)..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "完全分离已显示的绑定的�系人�为�独的�系人"
+
+#~ msgid "_Link"
+#~ msgstr "绑定(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "解除已绑定的�系人 %s？"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "您确定您�接触这些已绑定的�系人？这将会完全拆分已绑定的�系人为�独的�系"
+#~ "人。"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "解除绑定(_U)"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr "您将�创建一个新��，所�的修改将作废。您确定�继续�？"
+
+#~ msgid "_Personal Information"
+#~ msgstr "个人信�(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "在�独窗�中打开新�天(_O)"
+
 #~ msgid "Call volume"
 #~ msgstr "�电音�"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 12ebb28c5..6704d1a17 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 3.3.3\n"
+"Project-Id-Version: empathy 3.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-14 20:22+0800\n"
-"PO-Revision-Date: 2012-01-14 20:23+0800\n"
+"POT-Creation-Date: 2012-02-04 15:09+0800\n"
+"PO-Revision-Date: 2012-02-04 15:09+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: zh_TW\n"
@@ -453,9 +453,9 @@ msgstr "是�為�天室使用佈景主題。"
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr "排��絡人清單時�使用哪個準則。�設值是使用�絡人的�稱「name�(�稱) 值來排�。而「state�(狀態) 值則會使用其狀態來排��絡人清單。"
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr "排��絡人清單時�使用哪個準則。�設值是使用�絡人的狀態「state�(狀態) 值來排�。而「name�(�稱) 值則會根據據�稱來排��絡人清單。"
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
@@ -463,7 +463,7 @@ msgstr "管�訊�與 VoIP 帳號"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
+#: ../src/empathy-accounts-dialog.c:2327
 msgid "Messaging and VoIP Accounts"
 msgstr "訊�與 VoIP 帳號"
 
@@ -491,7 +491,7 @@ msgstr "嘗試傳輸檔案時發生錯誤"
 msgid "The other participant is unable to transfer the file"
 msgstr "其他的�與者無法傳輸該檔案"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "�明原因"
 
@@ -527,203 +527,207 @@ msgstr "已播打 %s"
 msgid "Call from %s"
 msgstr "%s 的來電"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "隱�"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "離線"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
+#: ../libempathy/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:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "使用中的�稱"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "沒有�供證書"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "證書�被信任"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "證書已逾期"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "證書尚未使用"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "證書主機�稱�符"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "證書指紋檔�符"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "證書為自我簽署"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "證書錯誤"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "加密無法使用"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "證書無效"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "連線�拒"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "無法建立連線"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "已失去連線"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:355
 msgid "This resource is already connected to the server"
 msgstr "此資�已連接至該伺�器"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "連線已被使用相�資�的新連線�代"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "該帳號已經存在於伺�器上"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "伺�器目��於忙碌以致於無法處�該連線"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "已撤銷證書"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "證書使用�安全的密碼演算法，或是密碼處�上較弱"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "伺�器證書的長度，或是伺�器證書�的深度超�密碼函�庫所能處�的範�"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "你的軟件�舊"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "內部錯誤"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook �天"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒�"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分�以�"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d �時以�"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以�"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 週�"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 個月以�"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "未來"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "所有帳號"
 
@@ -1266,192 +1270,199 @@ msgstr "此�定�支�緊急通話功能"
 msgid "You don't have enough credit in order to place this call"
 msgstr "你的存��足以買下該通話。"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:710
 msgid "Failed to open private chat"
 msgstr "開啟�人�天失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:768
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題�被支�"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:774
 msgid "You are not allowed to change the topic"
 msgstr "你�被�許更改這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:973
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "「%s��是有效的�絡人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清除目�談話的所有訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>：設置目�談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<�天室 ID>] [<原因>]：離開�天室，�設為目�的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <�絡人 ID> [<訊�>]：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <�絡人 ID> <訊�>：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <網�>：更改在目�伺�器上的你的網�"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊�>：�出一個 ACTION 訊�到目�的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr "/say <訊�>：�出 <訊�> 到目�的談話中。這用於傳�以「/�開頭的訊�。舉例來說：「/say /join 是用來�加新的�天室�"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <�絡人 ID>：顯示�絡人的相關資訊"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1105
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<命令>]：顯示所有支�的指令。如果有定義這個 <命令> 的話，便顯示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1124
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1169
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1295
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請�見 /help 以�得�用的指令"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1541
 msgid "insufficient balance to send message"
 msgstr "餘��足以傳�訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c: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:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../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:1468
+#: ../libempathy-gtk/empathy-chat.c:1553
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "餘��足以傳�訊�。<a href='%s'>加值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1593
 msgid "not capable"
 msgstr "無法"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1600
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "invalid contact"
 msgstr "無效的�絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "permission denied"
 msgstr "權�被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "too long message"
 msgstr "太長的訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "unknown"
 msgstr "�明"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../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:1610
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1700
+#, fuzzy, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr "主題設定為: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1705
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2221
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../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:2230
+#: ../libempathy-gtk/empathy-chat.c:2326
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "加入「%s�至 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2396
 msgid "Insert Smiley"
 msgstr "�入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2414
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "傳�(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2471
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2560
 msgid "Failed to retrieve recent logs"
 msgstr "無法�得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2699
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1459,12 +1470,12 @@ msgstr "%s 已斷線"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2706
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2709
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1472,17 +1483,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2717
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2720
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2724
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此�天室"
@@ -1492,17 +1503,17 @@ msgstr "%s 已經離開此�天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2758
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經�加此�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2783
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �在被稱為 %s"
@@ -1510,7 +1521,7 @@ msgstr "%s �在被稱為 %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../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
@@ -1518,47 +1529,47 @@ msgid "Disconnected"
 msgstr "已斷線"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "Would you like to store this password?"
 msgstr "你想�儲存此密碼？"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3640
 msgid "Remember"
 msgstr "記�"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3650
 msgid "Not now"
 msgstr "�在��"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3694
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "�試"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3698
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請�試一次："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3828
 msgid "This room is protected by a password:"
 msgstr "此�天室已被密碼�護："
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3855
 msgid "Join"
 msgstr "�加"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "�功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4102
 msgid "Conversation"
 msgstr "談話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4107
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1626,33 +1637,29 @@ msgstr "開啟連�(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "個人資料"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新增�絡人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "�鎖 %s？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "你確定想��鎖「%s�讓他無法�與你�絡嗎？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "�鎖(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1695,133 +1702,133 @@ msgstr "你的訊�"
 msgid "Please let me see when you're online. Thanks!"
 msgstr "當你上線時請讓我知�。感��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-contact-widget.c:568
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "頻�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-contact-widget.c:748
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "國家 ISO 碼："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-contact-widget.c:750
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "國家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-contact-widget.c:752
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "州："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-contact-widget.c:754
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "市："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-contact-widget.c:756
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "�域："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "郵��號："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-contact-widget.c:760
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "街："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-contact-widget.c:762
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "建築："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-contact-widget.c:764
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "樓層："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-contact-widget.c:766
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "室："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-contact-widget.c:768
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "文字："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-contact-widget.c:770
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "�述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-contact-widget.c:772
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-contact-widget.c:774
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "準確度等級："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:776
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "錯誤："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:778
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "垂直誤差 (米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-contact-widget.c:780
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-contact-widget.c:782
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-contact-widget.c:784
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "方�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-contact-widget.c:786
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "爬�速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-contact-widget.c:788
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "上次更新於："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:790
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "經度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-contact-widget.c:792
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-contact-widget.c:794
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:848
-#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-contact-widget.c:847
+#: ../libempathy-gtk/empathy-contact-widget.c:862
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
 #: ../src/empathy-preferences.ui.h:15
@@ -1829,23 +1836,23 @@ msgid "Location"
 msgstr "�置"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:864
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s，%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-contact-widget.c:916
 #: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y %B %e æ–¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-contact-widget.c:998
 #: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-contact-widget.c:1054
 #: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
@@ -1958,27 +1965,27 @@ msgstr "OS："
 msgid "Version:"
 msgstr "版本："
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "羣組"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "請�擇這個�絡人�顯�在哪個羣組。注�你�以�擇一個以上的羣組或��擇羣組。"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "加入羣組(_G)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-roster-window.c:1919
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1951
 msgid "Group"
 msgstr "羣組"
 
@@ -2074,7 +2081,7 @@ msgid "_Video Call"
 msgstr "視�通話(_V)"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Previous Conversations"
 msgstr "�往談話(_P)"
 
@@ -2108,7 +2115,7 @@ msgid "_Link Contacts…"
 msgstr "連��絡人(_L)…"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../src/empathy-chat-window.c:1166
 msgid "Inviting you to this room"
 msgstr "邀請你到這個�天室"
 
@@ -2121,38 +2128,38 @@ msgstr "邀請到�天室(_I)"
 msgid "_Add Contact…"
 msgstr "加入�絡人(_A)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2307
 msgid "Delete and _Block"
 msgstr "刪除並�鎖(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2342
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "是�想�移除羣組「%s�？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2345
 msgid "Removing group"
 msgstr "正在移除羣組"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2400
+#: ../libempathy-gtk/empathy-individual-view.c:2617
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2477
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "是�想�移除�絡人「%s�？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2486
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr "你真的想�移除連��絡人「%s�嗎？請注�這會移除所有構�此連��絡羣的�絡人。"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2498
 msgid "Removing contact"
 msgstr "正在移除�絡人"
 
@@ -2593,12 +2600,12 @@ msgstr "語音通話��"
 msgid "Edit Custom Messages"
 msgstr "編輯自�訊�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "訊�編輯於 %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "一般"
 
@@ -2678,37 +2685,41 @@ 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:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "�擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "空間�足以儲存檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "需� %s 的空間以儲存此檔案，但僅有 %s �用。請�擇其他�置。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "收到來自 %s 的檔案"
@@ -2983,7 +2994,7 @@ msgid ""
 msgstr "你�以回到���次輸入帳號的詳細資料或��此助�，�後�從「編輯��單加入帳號。"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1276
 msgid "An error occurred"
 msgstr "發生錯誤"
 
@@ -3063,7 +3074,7 @@ msgid ""
 msgstr "Empathy �以自動探索與你連線到相�網絡上的人們，並且和他們�天。如果你想�使用此功能，請檢查下列詳細資料是�正確。你也�以在以後簡單地更改這些細節，或是用「帳號��話窗來�用此功能"
 
 #: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
+#: ../src/empathy-account-assistant.c:1152
 msgid "Edit->Accounts"
 msgstr "編輯 -> 帳號"
 
@@ -3071,7 +3082,7 @@ msgstr "編輯 -> 帳號"
 msgid "I do _not want to enable this feature for now"
 msgstr "我�在�想�啟用這項功能(_N)"
 
-#: ../src/empathy-account-assistant.c:1146
+#: ../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 "
@@ -3079,23 +3090,23 @@ msgid ""
 "the Accounts dialog"
 msgstr "你無法與連線到你本機網絡的人們�天，因為 telepathy-salut 尚未安�。如果你想�啟用此功能，請安� telepathy-salut 套件，並從「帳號��話窗建立「附近的人�帳號"
 
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1154
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut 尚未安�"
 
-#: ../src/empathy-account-assistant.c:1198
+#: ../src/empathy-account-assistant.c:1200
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "訊�與 VoIP 帳號助�"
 
-#: ../src/empathy-account-assistant.c:1232
+#: ../src/empathy-account-assistant.c:1234
 msgid "Welcome to Empathy"
 msgstr "歡迎使用 Empathy"
 
-#: ../src/empathy-account-assistant.c:1241
+#: ../src/empathy-account-assistant.c:1243
 msgid "Import your existing accounts"
 msgstr "匯入�有的帳號"
 
-#: ../src/empathy-account-assistant.c:1259
+#: ../src/empathy-account-assistant.c:1261
 msgid "Please enter personal details"
 msgstr "請輸入個人詳細資料"
 
@@ -3112,60 +3123,60 @@ msgstr "有與你的 %s 帳號相關的修改尚未儲存。"
 msgid "Your new account has not been saved yet."
 msgstr "尚未儲存你的新帳號。"
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../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:393
+#: ../src/empathy-accounts-dialog.c:385
 #, c-format
 msgid "Offline — %s"
 msgstr "離線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:397
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已斷線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:408
 msgid "Offline — No Network Connection"
 msgstr "離線 — 無網絡連線"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:415
 msgid "Unknown Status"
 msgstr "未知的狀態"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:427
 msgid "Offline — Account Disabled"
 msgstr "離線 — 帳號已�用"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:530
 msgid "Edit Connection Parameters"
 msgstr "編輯連線�數"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:693
 msgid "Failed to retrieve your personal information from the server."
 msgstr "無法從伺�器擷�你的個人資料。"
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:699
 msgid "Go online to edit your personal information."
 msgstr "上線以編輯你的個人資料。"
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:784
 msgid "_Edit Connection Parameters..."
 msgstr "編輯連線�數(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../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:1297
+#: ../src/empathy-accounts-dialog.c:1293
 msgid "This will not remove your account on the server."
 msgstr "這�會移除伺�器上的你的帳號。"
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../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?"
@@ -3174,15 +3185,15 @@ msgstr ""
 "你所�的更改。確定�繼續？"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1705
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1706
 msgid "_Disable"
 msgstr "�用(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../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?"
@@ -3523,46 +3534,86 @@ msgid "_Settings"
 msgstr "設定值(_S)"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:285
+msgid "Close this window?"
+msgstr "�關閉這個視窗？"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr "關閉此視窗會離開 %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 個�天室。你將無法接收到之後的訊�，除�你�次�與。"
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+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 "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)"
 msgstr[0] "%s (%d 個未讀)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (與 %u 其他的)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (來自其他人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (來自所有人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:888
 msgid "SMS:"
 msgstr "SMS："
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:898
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在傳� %d 個訊�"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
 msgstr "正在輸入訊�。"
 
@@ -3722,7 +3773,7 @@ msgstr "你被邀請�加 %s"
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372
 msgid "Password required"
 msgstr "需�密碼"
 
@@ -3874,63 +3925,83 @@ msgstr "通訊�定"
 msgid "Source"
 msgstr "來�"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:389
 msgid "Provide Password"
 msgstr "�供密碼"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:395
 msgid "Disconnect"
 msgstr "æ–·ç·š"
 
-#: ../src/empathy-roster-window.c:626
+#: ../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-roster-window.c:733
+#: ../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:799
+#: ../src/empathy-roster-window.c:831
 msgid "Update software..."
 msgstr "更新軟件..."
 
-#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:942
 msgid "Reconnect"
 msgstr "�新連接"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:948
 msgid "Edit Account"
 msgstr "編輯帳號"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1092
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "加值 %s (%s)..."
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1138
 msgid "Top up account credit"
 msgstr "加值帳號存�"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1210
 msgid "Top Up..."
 msgstr "加值..."
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1933
 msgid "Contact"
 msgstr "�絡人"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../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 ""
+
+#: ../src/empathy-roster-window.c:2419
 msgid "Contact List"
 msgstr "�絡人清單"
 
+#: ../src/empathy-roster-window.ui.h:1
+#, fuzzy
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "帳號(_A)"
+
 #: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "�絡人地圖(_M)"
@@ -4009,15 +4080,11 @@ msgstr "新增談話(_N)…"
 msgid "_Offline Contacts"
 msgstr "離線�絡人(_O)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "個人資料(_P)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "�天室(_R)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "�尋�絡人(_S)…"
 
@@ -4097,7 +4164,7 @@ msgid "New conversation"
 msgstr "新增談話"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "�絡人上線"
 
 #: ../src/empathy-preferences.c:170
@@ -4117,46 +4184,46 @@ msgid "Language"
 msgstr "語言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "�英�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "�山伯"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "白玉環與��墜，為何�能夫妻�？"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "豈知你我自作主，無人當它是�媒。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "豈知好事�虛話，棒打鴛鴦兩離分。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "爹爹許了馬家婚，心已碎，�難伸。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "將來有命終相見，無命今生�相逄。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "�英�已斷線"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "�好設定"
 
@@ -4256,51 +4323,51 @@ msgid "Spell Checking"
 msgstr "拼字檢查"
 
 #: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "開啟�天於："
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這�的語言清單��映出你已經安�字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr "使用回音消除來改善通話�質(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "樣�："
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "啟動時自動連線(_A)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "手機(_C)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡�通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "網絡 (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "在個別視窗開啟新的�天(_O)"
-
 #: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "�我的�絡人公開�置(_P)"
@@ -4310,6 +4377,14 @@ msgstr "�我的�絡人公開�置(_P)"
 msgid "_Reduce location accuracy"
 msgstr "�低�置準確度(_R)"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "新視窗(_W)"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "新分�(_B)"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "狀態"
@@ -4576,6 +4651,15 @@ msgstr "比�大�寫(_M)"
 msgid "Adding new account"
 msgstr "新增帳號"
 
+#~ msgid "Personal Information"
+#~ msgstr "個人資訊"
+
+#~ msgid "_Personal Information"
+#~ msgstr "個人資訊(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "在個別視窗開啟新的�天(_O)"
+
 #~ msgid "Call volume"
 #~ msgstr "通話音�"
 
@@ -4839,8 +4923,5 @@ msgstr "新增帳號"
 #~ msgid "Hidden"
 #~ msgstr "隱�"
 
-#~ msgid "User requested disconnect"
-#~ msgstr "連接�上�求的使用者"
-
 #~ msgid "<b>Location</b>"
 #~ msgstr "<b>�置</b>"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 45ccd3b39..292ed0af3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 3.3.3\n"
+"Project-Id-Version: empathy 3.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-14 20:22+0800\n"
-"PO-Revision-Date: 2012-01-14 00:38+0800\n"
+"POT-Creation-Date: 2012-02-04 15:09+0800\n"
+"PO-Revision-Date: 2012-01-31 20:47+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
 "Language: zh_TW\n"
@@ -453,11 +453,11 @@ msgstr "是�為�天室使用佈景主題。"
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
-"排�連絡人清單時�使用哪個準則。�設值是使用連絡人的�稱「name�(�稱) 值來排"
-"�。而「state�(狀態) 值則會使用其狀態來排�連絡人清單。"
+"排�連絡人清單時�使用哪個準則。�設值是使用連絡人的狀態「state�(狀態) 值來"
+"排�。而「name�(�稱) 值則會�據�稱來排�連絡人清單。"
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
@@ -465,7 +465,7 @@ msgstr "管�訊�與 VoIP 帳號"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
+#: ../src/empathy-accounts-dialog.c:2327
 msgid "Messaging and VoIP Accounts"
 msgstr "訊�與 VoIP 帳號"
 
@@ -493,7 +493,7 @@ msgstr "嘗試傳輸檔案時發生錯誤"
 msgid "The other participant is unable to transfer the file"
 msgstr "其他的�與者無法傳輸該檔案"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "�明原因"
 
@@ -529,203 +529,207 @@ msgstr "已播打 %s"
 msgid "Call from %s"
 msgstr "%s 的來電"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "隱�"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "離線"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
+#: ../libempathy/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:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "使用中的�稱"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "沒有�供憑證"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "憑證�被信任"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "憑證已逾期"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "憑證尚未使用"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "憑證主機�稱�符"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "憑證指紋檔�符"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "憑證為自我簽署"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "憑證錯誤"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "加密無法使用"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "憑證無效"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "連線�拒"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "無法建立連線"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "已失去連線"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:355
 msgid "This resource is already connected to the server"
 msgstr "此資�已連接至該伺�器"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "連線已被使用相�資�的新連線�代"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "該帳號已經存在於伺�器上"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "伺�器目��於忙碌以致於無法處�該連線"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "已撤銷憑證"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "憑證使用�安全的密碼演算法，或是密碼處�上較弱"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "伺�器憑證的長度，或是伺�器憑證�的深度超�密碼函�庫所能處�的範�"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "您的軟體�舊"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "內部錯誤"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook �天"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒�"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分�以�"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d �時以�"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以�"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 週�"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 個月以�"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "未來"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "所有帳號"
 
@@ -1269,62 +1273,62 @@ msgstr "此�定�支�緊急通話功能"
 msgid "You don't have enough credit in order to place this call"
 msgstr "您的存��足以買下該通話。"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:710
 msgid "Failed to open private chat"
 msgstr "開啟�人�天失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:768
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題�被支�"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:774
 msgid "You are not allowed to change the topic"
 msgstr "您�被�許變更這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:973
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "「%s��是有效的連絡人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清除目�談話的所有訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>：設置目�談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<�天室 ID>] [<原因>]：離開�天室，�設為目�的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <�絡人 ID> [<訊�>]：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <�絡人 ID> <訊�>：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <暱稱>：變更在目�伺�器上的您的暱稱"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊�>：�出一個 ACTION 訊�到目�的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../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 "
@@ -1333,11 +1337,11 @@ msgstr ""
 "/say <訊�>：�出 <訊�> 到目�的談話中。這用於傳�以「/�開頭的訊�。舉例來"
 "說：「/say /join 是用來�加新的�天室�"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <�絡人 ID>：顯示�絡人的相關資訊"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1105
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1345,120 +1349,127 @@ msgstr ""
 "/help [<命令>]：顯示所有支�的指令。如果有定義這個 <命令> 的話，便顯示它的用"
 "法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1124
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1169
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1295
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請�見 /help 以�得�用的指令"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1541
 msgid "insufficient balance to send message"
 msgstr "餘��足以傳�訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c: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:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../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:1468
+#: ../libempathy-gtk/empathy-chat.c:1553
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "餘��足以傳�訊�。<a href='%s'>加值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1593
 msgid "not capable"
 msgstr "無法"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1600
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "invalid contact"
 msgstr "無效的連絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "permission denied"
 msgstr "權�被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "too long message"
 msgstr "太長的訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "unknown"
 msgstr "�明"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../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:1610
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1700
+#, fuzzy, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr "主題設定為: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1705
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2221
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../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:2230
+#: ../libempathy-gtk/empathy-chat.c:2326
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "加入「%s�至 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2396
 msgid "Insert Smiley"
 msgstr "�入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2414
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "傳�(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2471
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2560
 msgid "Failed to retrieve recent logs"
 msgstr "無法�得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2699
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1466,12 +1477,12 @@ msgstr "%s 已斷線"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2706
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2709
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1479,17 +1490,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2717
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2720
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2724
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此�天室"
@@ -1499,17 +1510,17 @@ msgstr "%s 已經離開此�天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2758
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經�加此�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2783
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �在被稱為 %s"
@@ -1517,7 +1528,7 @@ msgstr "%s �在被稱為 %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2846
+#: ../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
@@ -1525,47 +1536,47 @@ msgid "Disconnected"
 msgstr "已斷線"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "Would you like to store this password?"
 msgstr "您想�儲存此密碼？"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3640
 msgid "Remember"
 msgstr "記�"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3650
 msgid "Not now"
 msgstr "�在��"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3694
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "�試"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3698
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請�試一次："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3828
 msgid "This room is protected by a password:"
 msgstr "此�天室已被密碼�護："
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3855
 msgid "Join"
 msgstr "�加"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "�功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4102
 msgid "Conversation"
 msgstr "談話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4107
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1633,33 +1644,29 @@ msgstr "開啟連�(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "個人資訊"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新增連絡人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "�鎖 %s？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
 #: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "您確定想��鎖「%s�讓他無法�與您�絡嗎？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "�鎖(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -1702,133 +1709,133 @@ msgstr "您的訊�"
 msgid "Please let me see when you're online. Thanks!"
 msgstr "當您上線時請讓我知�。感��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-contact-widget.c:568
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "頻�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-contact-widget.c:748
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "國家 ISO 碼："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-contact-widget.c:750
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "國家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-contact-widget.c:752
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "州："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-contact-widget.c:754
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "市："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-contact-widget.c:756
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "�域："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "郵��號："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-contact-widget.c:760
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "街："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-contact-widget.c:762
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "建築："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-contact-widget.c:764
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "樓層："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-contact-widget.c:766
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "室："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-contact-widget.c:768
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "文字："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-contact-widget.c:770
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "�述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-contact-widget.c:772
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-contact-widget.c:774
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "準確度等級："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:776
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "錯誤："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:778
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "垂直誤差 (公尺)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-contact-widget.c:780
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (公尺)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-contact-widget.c:782
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-contact-widget.c:784
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "方�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-contact-widget.c:786
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "爬�速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-contact-widget.c:788
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "上次更新於："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:790
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "經度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-contact-widget.c:792
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-contact-widget.c:794
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:848
-#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-contact-widget.c:847
+#: ../libempathy-gtk/empathy-contact-widget.c:862
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
 #: ../src/empathy-preferences.ui.h:15
@@ -1836,23 +1843,23 @@ msgid "Location"
 msgstr "�置"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:864
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s，%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-contact-widget.c:916
 #: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y %B %e æ–¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-contact-widget.c:998
 #: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-contact-widget.c:1054
 #: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
@@ -1965,28 +1972,28 @@ msgstr "OS："
 msgid "Version:"
 msgstr "版本："
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "群組"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
 "請�擇這個連絡人�顯�在哪個群組。注�您�以�擇一個以上的群組或��擇群組。"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "加入群組(_G)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-roster-window.c:1919
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1951
 msgid "Group"
 msgstr "群組"
 
@@ -2082,7 +2089,7 @@ msgid "_Video Call"
 msgstr "視訊通話(_V)"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Previous Conversations"
 msgstr "�往談話(_P)"
 
@@ -2116,7 +2123,7 @@ msgid "_Link Contacts…"
 msgstr "連��絡人(_L)…"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../src/empathy-chat-window.c:1166
 msgid "Inviting you to this room"
 msgstr "邀請您到這個�天室"
 
@@ -2129,31 +2136,31 @@ msgstr "邀請到�天室(_I)"
 msgid "_Add Contact…"
 msgstr "加入�絡人(_A)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2307
 msgid "Delete and _Block"
 msgstr "刪除並�鎖(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2342
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "是�想�移除群組「%s�？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2345
 msgid "Removing group"
 msgstr "正在移除群組"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2400
+#: ../libempathy-gtk/empathy-individual-view.c:2617
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2477
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "是�想�移除連絡人「%s�？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2486
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2162,7 +2169,7 @@ msgstr ""
 "您真的想�移除連��絡人「%s�嗎？請注�這會移除所有構�此連��絡群的�絡"
 "人。"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2498
 msgid "Removing contact"
 msgstr "正在移除連絡人"
 
@@ -2604,12 +2611,12 @@ msgstr "語音通話��"
 msgid "Edit Custom Messages"
 msgstr "編輯自訂訊�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "訊�編輯於 %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "一般"
 
@@ -2689,37 +2696,41 @@ 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:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "�擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "空間�足以儲存檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "需� %s 的空間以儲存此檔案，但僅有 %s �用。請�擇其他�置。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "收到來自 %s 的檔案"
@@ -3004,7 +3015,7 @@ msgstr ""
 "號。"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1276
 msgid "An error occurred"
 msgstr "發生錯誤"
 
@@ -3090,7 +3101,7 @@ msgstr ""
 "用「帳號��話窗來�用此功能"
 
 #: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
+#: ../src/empathy-account-assistant.c:1152
 msgid "Edit->Accounts"
 msgstr "編輯 -> 帳號"
 
@@ -3098,7 +3109,7 @@ msgstr "編輯 -> 帳號"
 msgid "I do _not want to enable this feature for now"
 msgstr "我�在�想�啟用這項功能(_N)"
 
-#: ../src/empathy-account-assistant.c:1146
+#: ../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 "
@@ -3109,23 +3120,23 @@ msgstr ""
 "啟用此功能，請安� telepathy-salut 套件，並從「帳號��話窗建立「附近的人�帳"
 "號"
 
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1154
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut 尚未安�"
 
-#: ../src/empathy-account-assistant.c:1198
+#: ../src/empathy-account-assistant.c:1200
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "訊�與 VoIP 帳號助�"
 
-#: ../src/empathy-account-assistant.c:1232
+#: ../src/empathy-account-assistant.c:1234
 msgid "Welcome to Empathy"
 msgstr "歡迎使用 Empathy"
 
-#: ../src/empathy-account-assistant.c:1241
+#: ../src/empathy-account-assistant.c:1243
 msgid "Import your existing accounts"
 msgstr "匯入�有的帳號"
 
-#: ../src/empathy-account-assistant.c:1259
+#: ../src/empathy-account-assistant.c:1261
 msgid "Please enter personal details"
 msgstr "請輸入個人詳細資料"
 
@@ -3142,60 +3153,60 @@ msgstr "有與您的 %s 帳號相關的修改尚未儲存。"
 msgid "Your new account has not been saved yet."
 msgstr "尚未儲存您的新帳號。"
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../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:393
+#: ../src/empathy-accounts-dialog.c:385
 #, c-format
 msgid "Offline — %s"
 msgstr "離線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:397
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已斷線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:408
 msgid "Offline — No Network Connection"
 msgstr "離線 — 無網路連線"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:415
 msgid "Unknown Status"
 msgstr "未知的狀態"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:427
 msgid "Offline — Account Disabled"
 msgstr "離線 — 帳號已�用"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:530
 msgid "Edit Connection Parameters"
 msgstr "編輯連線�數"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:693
 msgid "Failed to retrieve your personal information from the server."
 msgstr "無法從伺�器擷�您的個人資訊。"
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:699
 msgid "Go online to edit your personal information."
 msgstr "上線以編輯您的個人資訊。"
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:784
 msgid "_Edit Connection Parameters..."
 msgstr "編輯連線�數(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../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:1297
+#: ../src/empathy-accounts-dialog.c:1293
 msgid "This will not remove your account on the server."
 msgstr "這�會移除伺�器上的您的帳號。"
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../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?"
@@ -3204,15 +3215,15 @@ msgstr ""
 "您所�的變更。確定�繼續？"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1705
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1706
 msgid "_Disable"
 msgstr "�用(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../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?"
@@ -3555,46 +3566,87 @@ msgid "_Settings"
 msgstr "設定值(_S)"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:285
+msgid "Close this window?"
+msgstr "�關閉這個視窗？"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr "關閉此視窗會離開 %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 個�天室。您將無法接收到之後的訊�，除�您�次�與。"
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+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 "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)"
 msgstr[0] "%s (%d 個未讀)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (與 %u 其他的)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (來自其他人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (來自所有人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:888
 msgid "SMS:"
 msgstr "SMS："
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:898
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在傳� %d 個訊�"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
 msgstr "正在輸入訊�。"
 
@@ -3754,7 +3806,7 @@ msgstr "您被邀請�加 %s"
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372
 msgid "Password required"
 msgstr "需�密碼"
 
@@ -3906,63 +3958,83 @@ msgstr "通訊�定"
 msgid "Source"
 msgstr "來�"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:389
 msgid "Provide Password"
 msgstr "�供密碼"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:395
 msgid "Disconnect"
 msgstr "æ–·ç·š"
 
-#: ../src/empathy-roster-window.c:626
+#: ../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-roster-window.c:733
+#: ../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:799
+#: ../src/empathy-roster-window.c:831
 msgid "Update software..."
 msgstr "更新軟體..."
 
-#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:942
 msgid "Reconnect"
 msgstr "�新連接"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:948
 msgid "Edit Account"
 msgstr "編輯帳號"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1092
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "加值 %s (%s)..."
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1138
 msgid "Top up account credit"
 msgstr "加值帳號存�"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1210
 msgid "Top Up..."
 msgstr "加值..."
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1933
 msgid "Contact"
 msgstr "連絡人"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../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 ""
+
+#: ../src/empathy-roster-window.c:2419
 msgid "Contact List"
 msgstr "連絡人清單"
 
+#: ../src/empathy-roster-window.ui.h:1
+#, fuzzy
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "帳號(_A)"
+
 #: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "連絡人地圖(_M)"
@@ -4041,15 +4113,11 @@ msgstr "新增談話(_N)…"
 msgid "_Offline Contacts"
 msgstr "離線連絡人(_O)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "個人資訊(_P)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "�天室(_R)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "�尋�絡人(_S)…"
 
@@ -4130,7 +4198,7 @@ msgid "New conversation"
 msgstr "新增談話"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "連絡人上線"
 
 #: ../src/empathy-preferences.c:170
@@ -4150,46 +4218,46 @@ msgid "Language"
 msgstr "語言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "�英�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "�山伯"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "白玉環與��墜，為何�能夫妻�？"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "豈知你我自作主，無人當它是�媒。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "豈知好事�虛話，棒打鴛鴦兩離分。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "爹爹許了馬家婚，心已碎，�難伸。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "將來有命終相見，無命今生�相逄。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "�英�已斷線"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "�好設定"
 
@@ -4294,51 +4362,51 @@ msgid "Spell Checking"
 msgstr "拼字檢查"
 
 #: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "開啟�天於："
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裡的語言清單��映出您已經安�字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr "使用回音消除來改善通話�質(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "樣�："
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "啟動時自動連線(_A)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "手機(_C)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡�通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "網路 (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "在個別視窗開啟新的�天(_O)"
-
 #: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "�我的連絡人公開�置(_P)"
@@ -4348,6 +4416,14 @@ msgstr "�我的連絡人公開�置(_P)"
 msgid "_Reduce location accuracy"
 msgstr "�低�置準確度(_R)"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "新視窗(_W)"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "新分�(_B)"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "狀態"
@@ -4614,6 +4690,15 @@ msgstr "比�大�寫(_M)"
 msgid "Adding new account"
 msgstr "新增帳號"
 
+#~ msgid "Personal Information"
+#~ msgstr "個人資訊"
+
+#~ msgid "_Personal Information"
+#~ msgstr "個人資訊(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "在個別視窗開啟新的�天(_O)"
+
 #~ msgid "Call volume"
 #~ msgstr "通話音�"
 
@@ -4877,8 +4962,5 @@ msgstr "新增帳號"
 #~ msgid "Hidden"
 #~ msgstr "隱�"
 
-#~ msgid "User requested disconnect"
-#~ msgstr "連接�上�求的使用者"
-
 #~ msgid "<b>Location</b>"
 #~ msgstr "<b>�置</b>"
diff --git a/src/Makefile.am b/src/Makefile.am
index 4b42fd11d..a2aa31d5b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,9 +30,7 @@ noinst_LTLIBRARIES = libempathy-accounts-common.la
 
 libempathy_accounts_common_la_SOURCES =					\
 	empathy-accounts-common.c empathy-accounts-common.h		\
-	empathy-account-assistant.c empathy-account-assistant.h		\
 	empathy-accounts-dialog.c empathy-accounts-dialog.h		\
-	empathy-auto-salut-account-helper.c empathy-auto-salut-account-helper.h \
 	empathy-import-dialog.c empathy-import-dialog.h			\
 	empathy-import-pidgin.c empathy-import-pidgin.h			\
 	empathy-import-widget.c empathy-import-widget.h			\
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
deleted file mode 100644
index 0a5f1d76b..000000000
--- a/src/empathy-account-assistant.c
+++ /dev/null
@@ -1,1309 +0,0 @@
-/*
- * Copyright (C) 2009 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
- */
-
-/* empathy-account-assistant.c */
-
-#include <config.h>
-#include <glib/gi18n-lib.h>
-#include <telepathy-glib/util.h>
-#include <gdk/gdkkeysyms.h>
-
-#include "empathy-account-assistant.h"
-#include "empathy-import-widget.h"
-#include "empathy-import-utils.h"
-#include "empathy-auto-salut-account-helper.h"
-
-#include <libempathy/empathy-account-settings.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-account-widget.h>
-#include <libempathy-gtk/empathy-protocol-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
-
-G_DEFINE_TYPE (EmpathyAccountAssistant, empathy_account_assistant,
-    GTK_TYPE_ASSISTANT)
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountAssistant)
-
-typedef enum {
-  RESPONSE_IMPORT = 1,
-  RESPONSE_ENTER_ACCOUNT = 2,
-  RESPONSE_CREATE_ACCOUNT = 3,
-  RESPONSE_SALUT_ONLY = 4
-} FirstPageResponse;
-
-typedef enum {
-  RESPONSE_CREATE_AGAIN = 1,
-  RESPONSE_CREATE_STOP = 2
-} CreateEnterPageResponse;
-
-typedef enum {
-  PAGE_INTRO = 0,
-  PAGE_IMPORT = 1,
-  PAGE_ENTER_CREATE = 2,
-  PAGE_SALUT = 3,
-} PageID;
-
-enum {
-  PROP_PARENT = 1,
-  PROP_CONNECTION_MGRS,
-};
-
-typedef struct {
-  FirstPageResponse first_resp;
-  CreateEnterPageResponse create_enter_resp;
-  gboolean enter_create_forward;
-  TpAccountManager *account_mgr;
-  EmpathyConnectionManagers *connection_mgrs;
-  PageID current_page_id;
-
-  /* enter or create page */
-  GtkWidget *enter_or_create_page;
-  GtkWidget *current_account_widget;
-  EmpathyAccountWidget *current_widget_object;
-  GtkWidget *first_label;
-  GtkWidget *second_label;
-  GtkWidget *chooser;
-  GtkWidget *create_again_radio;
-  EmpathyAccountSettings *settings;
-  gboolean is_creating;
-
-  /* import page */
-  EmpathyImportWidget *iw;
-  GtkWidget *import_page;
-
-  /* salut page */
-  GtkWidget *salut_page;
-  EmpathyAccountSettings *salut_settings;
-  GtkWidget *salut_account_widget;
-  gboolean create_salut_account;
-  gboolean display_salut_page;
-
-  GtkWindow *parent_window;
-
-  gboolean dispose_run;
-} EmpathyAccountAssistantPriv;
-
-static GtkWidget * account_assistant_build_enter_or_create_page (
-    EmpathyAccountAssistant *self);
-static void account_assistant_finish_enter_or_create_page (
-    EmpathyAccountAssistant *self,
-    gboolean is_enter);
-
-static void do_constructed (GObject *object);
-
-static GtkWidget *
-build_error_vbox (const gchar *primary_message,
-    const gchar *secondary_message)
-{
-  GtkWidget *main_vbox, *w, *hbox;
-  PangoAttrList *list;
-
-  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
-  gtk_widget_show (main_vbox);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
-  gtk_widget_show (hbox);
-
-  w = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR,
-      GTK_ICON_SIZE_DIALOG);
-  gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-  gtk_widget_show (w);
-
-  w = gtk_label_new (primary_message);
-  gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-  list = pango_attr_list_new ();
-  pango_attr_list_insert (list, pango_attr_scale_new (PANGO_SCALE_LARGE));
-  pango_attr_list_insert (list, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
-  gtk_label_set_attributes (GTK_LABEL (w), list);
-  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_widget_show (w);
-
-  pango_attr_list_unref (list);
-
-  w = gtk_label_new (secondary_message);
-  gtk_label_set_use_markup (GTK_LABEL (w), TRUE);
-  gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0);
-  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_widget_show (w);
-
-  return main_vbox;
-}
-
-static GtkWidget *
-account_assistant_build_error_page (EmpathyAccountAssistant *self,
-    GError *error, gint page_num)
-{
-  GtkWidget *main_vbox, *w;
-  const char *primary_message;
-  gchar *secondary_message, *markup;
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-
-  if (page_num == PAGE_IMPORT)
-    primary_message = _("There was an error while importing the accounts.");
-  else if (page_num >= PAGE_ENTER_CREATE &&
-      priv->first_resp == RESPONSE_ENTER_ACCOUNT)
-    primary_message = _("There was an error while parsing the account details.");
-  else if (page_num >= PAGE_ENTER_CREATE &&
-      priv->first_resp == RESPONSE_CREATE_ACCOUNT)
-    primary_message = _("There was an error while creating the account.");
-  else
-    primary_message = _("There was an error.");
-
-  markup = g_markup_printf_escaped ("<span style=\"italic\">%s</span>",
-      error->message);
-  secondary_message = g_strdup_printf (_("The error message was: %s"), markup);
-
-  main_vbox = build_error_vbox (primary_message, secondary_message);
-
-  w = gtk_label_new (_("You can either go back and try to enter your "
-          "accounts' details again or quit this assistant and add accounts "
-          "later from the Edit menu."));
-  gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 6);
-  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_widget_show (w);
-
-  g_free (markup);
-  g_free (secondary_message);
-  return main_vbox;
-}
-
-static void
-account_assistant_back_button_clicked_cb (GtkButton *button,
-    EmpathyAccountAssistant *self)
-{
-  gint page_num;
-
-  page_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
-          "page-num"));
-  gtk_assistant_remove_action_widget (GTK_ASSISTANT (self),
-      GTK_WIDGET (button));
-  gtk_assistant_set_current_page (GTK_ASSISTANT (self), page_num);
-}
-
-static void
-account_assistant_present_error_page (EmpathyAccountAssistant *self,
-    GError *error, gint page_num)
-{
-  GtkWidget *error_page, *back_button;
-  gint num;
-
-  error_page = account_assistant_build_error_page (self, error,
-      page_num);
-  num = gtk_assistant_append_page (GTK_ASSISTANT (self), error_page);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (self), error_page,
-      _("An error occurred"));
-  gtk_assistant_set_page_type (GTK_ASSISTANT (self), error_page,
-      GTK_ASSISTANT_PAGE_SUMMARY);
-
-  back_button = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
-  gtk_assistant_add_action_widget (GTK_ASSISTANT (self), back_button);
-  g_object_set_data (G_OBJECT (back_button),
-      "page-num", GINT_TO_POINTER (page_num));
-  g_signal_connect (back_button, "clicked",
-      G_CALLBACK (account_assistant_back_button_clicked_cb), self);
-  gtk_widget_show (back_button);
-
-  gtk_assistant_set_current_page (GTK_ASSISTANT (self), num);
-}
-
-static void
-update_create_page_buttons (EmpathyAccountAssistant *self)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  GtkAssistantPageType type;
-
-  if (priv->display_salut_page ||
-      priv->create_enter_resp == RESPONSE_CREATE_AGAIN)
-    type = GTK_ASSISTANT_PAGE_CONTENT;
-  else
-    type = GTK_ASSISTANT_PAGE_CONFIRM;
-
-  gtk_assistant_set_page_type (GTK_ASSISTANT (self), priv->enter_or_create_page,
-      type);
-}
-
-static void
-account_assistant_reset_enter_create_page (EmpathyAccountAssistant *self)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  GtkWidget *page;
-  gint idx;
-
-  page = account_assistant_build_enter_or_create_page (self);
-  idx = gtk_assistant_append_page (GTK_ASSISTANT (self), page);
-  priv->enter_or_create_page = page;
-  update_create_page_buttons (self);
-
-  gtk_assistant_set_current_page (GTK_ASSISTANT (self), idx);
-
-  account_assistant_finish_enter_or_create_page (self,
-      priv->first_resp == RESPONSE_ENTER_ACCOUNT ?
-      TRUE : FALSE);
-}
-
-static void
-account_assistant_account_enabled_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  GError *error = NULL;
-  EmpathyAccountAssistant *self = user_data;
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  const gchar *protocol;
-  TpAccount *account = TP_ACCOUNT (source);
-  gint current_idx;
-  gboolean salut_created = FALSE;
-
-  tp_account_set_enabled_finish (account, result, &error);
-
-  if (error)
-    {
-      g_warning ("Error enabling an account: %s", error->message);
-      g_error_free (error);
-    }
-
-  protocol = tp_account_get_protocol (account);
-  if (!tp_strdiff (protocol, "local-xmpp"))
-    {
-      salut_created = TRUE;
-    }
-
-  empathy_connect_new_account (account, priv->account_mgr);
-
-  current_idx = gtk_assistant_get_current_page (GTK_ASSISTANT (self));
-  if (current_idx == PAGE_SALUT && !salut_created)
-    /* We are on the Salut page and aren't creating the salut account so don't
-     * terminate the assistant. */
-    return;
-
-  if (priv->create_enter_resp == RESPONSE_CREATE_STOP)
-    g_signal_emit_by_name (self, "close");
-  else
-    account_assistant_reset_enter_create_page (self);
-}
-
-static void
-account_assistant_apply_account_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  GError *error = NULL;
-  EmpathyAccountAssistant *self = user_data;
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source);
-  TpAccount *account;
-
-  empathy_account_settings_apply_finish (settings, result, NULL, &error);
-
-  priv->is_creating = FALSE;
-
-  if (error != NULL)
-    {
-      account_assistant_present_error_page (self, error,
-          gtk_assistant_get_current_page (GTK_ASSISTANT (self)));
-      g_error_free (error);
-      return;
-    }
-
-  /* enable the newly created account */
-  account = empathy_account_settings_get_account (settings);
-  tp_account_set_enabled_async (account, TRUE,
-      account_assistant_account_enabled_cb, self);
-}
-
-static void
-account_assistant_apply_account_and_finish (EmpathyAccountAssistant *self,
-    EmpathyAccountSettings *settings,
-    gboolean set_display_name)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-
-  if (settings == NULL)
-    return;
-
-  priv->is_creating = TRUE;
-
-  if (set_display_name)
-    {
-      gchar *display_name;
-
-      display_name = empathy_account_widget_get_default_display_name (
-        priv->current_widget_object);
-
-      empathy_account_settings_set_display_name_async (settings,
-        display_name, NULL, NULL);
-
-      g_free (display_name);
-    }
-
-  empathy_account_settings_apply_async (settings,
-      account_assistant_apply_account_cb, self);
-}
-
-static void
-account_assistant_handle_apply_cb (EmpathyAccountWidget *widget_object,
-    gboolean is_valid,
-    EmpathyAccountAssistant *self)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (self),
-      priv->enter_or_create_page, is_valid);
-}
-
-static void
-account_assistant_protocol_changed_cb (GtkComboBox *chooser,
-    EmpathyAccountAssistant *self)
-{
-  EmpathyAccountSettings *settings;
-  EmpathyAccountAssistantPriv *priv;
-  GtkWidget *account_widget;
-  EmpathyAccountWidget *widget_object = NULL;
-
-  priv = GET_PRIV (self);
-
-  settings = empathy_protocol_chooser_create_account_settings (
-      EMPATHY_PROTOCOL_CHOOSER (chooser));
-
-  if (settings == NULL)
-    return;
-
-  if (priv->first_resp == RESPONSE_CREATE_ACCOUNT)
-    empathy_account_settings_set_boolean (settings, "register", TRUE);
-
-  widget_object = empathy_account_widget_new_for_protocol (settings, TRUE);
-  account_widget = empathy_account_widget_get_widget (widget_object);
-
-  if (priv->current_account_widget != NULL)
-    {
-      g_signal_handlers_disconnect_by_func (priv->current_widget_object,
-          account_assistant_handle_apply_cb, self);
-      gtk_widget_destroy (priv->current_account_widget);
-    }
-
-  empathy_account_widget_hide_buttons (widget_object);
-
-  priv->current_account_widget = account_widget;
-  priv->current_widget_object = widget_object;
-
-  if (priv->settings != NULL)
-    g_object_unref (priv->settings);
-
-  priv->settings = settings;
-
-  g_signal_connect (priv->current_widget_object, "handle-apply",
-      G_CALLBACK (account_assistant_handle_apply_cb), self);
-
-  if (empathy_account_settings_is_valid (settings))
-    {
-      gtk_assistant_set_page_complete (GTK_ASSISTANT (self),
-          priv->enter_or_create_page, TRUE);
-    }
-
-  gtk_box_pack_start (GTK_BOX (priv->enter_or_create_page), account_widget,
-      FALSE, FALSE, 0);
-  gtk_widget_show (account_widget);
-}
-
-static gboolean
-account_assistant_chooser_enter_details_filter_func (
-    TpConnectionManager *cm,
-    TpConnectionManagerProtocol *protocol,
-    const gchar *service,
-    gpointer user_data)
-{
-  if (!tp_strdiff (protocol->name, "local-xmpp"))
-    return FALSE;
-
-  return TRUE;
-}
-
-static gboolean
-account_assistant_chooser_create_account_filter_func (
-    TpConnectionManager *cm,
-    TpConnectionManagerProtocol *protocol,
-    const gchar *service,
-    gpointer user_data)
-{
-  if (service != NULL)
-    return FALSE;
-
-  return tp_connection_manager_protocol_can_register (protocol);
-}
-
-static void
-account_assistant_finish_enter_or_create_page (EmpathyAccountAssistant *self,
-    gboolean is_enter)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-
-  if (is_enter)
-    {
-      gtk_label_set_label (GTK_LABEL (priv->first_label),
-          _("What kind of chat account do you have?"));
-      /*      gtk_label_set_label (GTK_LABEL (priv->second_label),
-          _("If you have other accounts to set up, you can do "
-              "that at any time from the Edit menu."));
-      */
-      gtk_label_set_label (GTK_LABEL (priv->second_label),
-          _("Do you have any other chat accounts you want to set up?"));
-      empathy_protocol_chooser_set_visible (
-          EMPATHY_PROTOCOL_CHOOSER (priv->chooser),
-          account_assistant_chooser_enter_details_filter_func, self);
-
-      gtk_assistant_set_page_title (GTK_ASSISTANT (self),
-          priv->enter_or_create_page, _("Enter your account details"));
-    }
-  else
-    {
-      gtk_label_set_label (GTK_LABEL (priv->first_label),
-          _("What kind of chat account do you want to create?"));
-      /*      gtk_label_set_label (GTK_LABEL (priv->second_label),
-          _("You can register other accounts, or setup "
-              "an existing one at any time from the Edit menu."));
-      */
-      gtk_label_set_label (GTK_LABEL (priv->second_label),
-          _("Do you want to create other chat accounts?"));
-      empathy_protocol_chooser_set_visible (
-          EMPATHY_PROTOCOL_CHOOSER (priv->chooser),
-          account_assistant_chooser_create_account_filter_func, self);
-
-      gtk_assistant_set_page_title (GTK_ASSISTANT (self),
-          priv->enter_or_create_page,
-          _("Enter the details for the new account"));
-    }
-
-  g_signal_connect (priv->chooser, "changed",
-      G_CALLBACK (account_assistant_protocol_changed_cb), self);
-
-  /* trigger show the first account widget */
-  account_assistant_protocol_changed_cb (GTK_COMBO_BOX (priv->chooser), self);
-}
-
-static gint
-account_assistant_page_forward_func (gint current_page,
-    gpointer user_data)
-{
-  EmpathyAccountAssistant *self = user_data;
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  gint retval;
-
-  retval = current_page;
-
-  if (current_page == PAGE_INTRO)
-    {
-      if (priv->first_resp == RESPONSE_ENTER_ACCOUNT ||
-          priv->first_resp == RESPONSE_CREATE_ACCOUNT)
-        retval = PAGE_ENTER_CREATE;
-      else if (priv->first_resp == RESPONSE_IMPORT)
-        retval = PAGE_IMPORT;
-      else if (priv->first_resp == RESPONSE_SALUT_ONLY)
-        retval = PAGE_SALUT;
-    }
-  else if (current_page == PAGE_IMPORT)
-    {
-      if (priv->display_salut_page)
-        retval = PAGE_SALUT;
-      else
-        /* Don't go forward */
-        retval = -1;
-    }
-  else if (current_page == PAGE_SALUT)
-    {
-      /* Don't go forward */
-      retval = -1;
-    }
-  else if (current_page >= PAGE_ENTER_CREATE)
-    {
-      if (priv->create_enter_resp == RESPONSE_CREATE_AGAIN)
-        {
-          priv->enter_create_forward = TRUE;
-          retval = current_page;
-        }
-      else if (priv->display_salut_page)
-        {
-          retval = PAGE_SALUT;
-        }
-      else
-        {
-          /* Don't go forward */
-          retval = -1;
-        }
-    }
-
-  return retval;
-}
-
-static void
-update_intro_page_buttons (EmpathyAccountAssistant *self)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  GtkWidget *intro_page;
-
-  intro_page = gtk_assistant_get_nth_page (GTK_ASSISTANT (self),
-      PAGE_INTRO);
-
-  if (priv->first_resp == RESPONSE_SALUT_ONLY &&
-      !priv->display_salut_page)
-    gtk_assistant_set_page_type (GTK_ASSISTANT (self), intro_page,
-        GTK_ASSISTANT_PAGE_SUMMARY);
-  else
-    gtk_assistant_set_page_type (GTK_ASSISTANT (self), intro_page,
-        GTK_ASSISTANT_PAGE_INTRO);
-}
-
-static void
-account_assistant_radio_choice_toggled_cb (GtkToggleButton *button,
-    EmpathyAccountAssistant *self)
-{
-  FirstPageResponse response;
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-
-  response = GPOINTER_TO_INT (g_object_get_data
-      (G_OBJECT (button), "response"));
-
-  priv->first_resp = response;
-
-  update_intro_page_buttons (self);
-}
-
-static GtkWidget *
-account_assistant_build_introduction_page (EmpathyAccountAssistant *self)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  GtkWidget *main_vbox, *hbox_1, *w, *vbox_1;
-  GtkWidget *radio = NULL;
-  GdkPixbuf *pix;
-  const gchar *str;
-
-  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_widget_show (main_vbox);
-  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
-
-  hbox_1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  gtk_box_pack_start (GTK_BOX (main_vbox), hbox_1, TRUE, TRUE, 0);
-  gtk_widget_show (hbox_1);
-
-  w = gtk_label_new (
-      _("With Empathy you can chat with people "
-        "online nearby and with friends and colleagues "
-        "who use Google Talk, AIM, Windows Live "
-        "and many other chat programs. With a microphone "
-        "or a webcam you can also have audio or video calls."));
-  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox_1), w, FALSE, FALSE, 0);
-  gtk_widget_show (w);
-
-  pix = empathy_pixbuf_from_icon_name_sized ("empathy", 80);
-  w = gtk_image_new_from_pixbuf (pix);
-  gtk_box_pack_start (GTK_BOX (hbox_1), w, FALSE, FALSE, 6);
-  gtk_widget_show (w);
-
-  g_object_unref (pix);
-
-  w = gtk_label_new (_("Do you have an account you've been using "
-          "with another chat program?"));
-  gtk_misc_set_alignment (GTK_MISC (w), 0, 0);
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0);
-  gtk_widget_show (w);
-
-  w = gtk_alignment_new (0, 0, 0, 0);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0);
-  gtk_box_pack_start (GTK_BOX (main_vbox), w, TRUE, TRUE, 0);
-  gtk_widget_show (w);
-
-  vbox_1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_box_set_homogeneous (GTK_BOX (vbox_1), TRUE);
-  gtk_container_add (GTK_CONTAINER (w), vbox_1);
-  gtk_widget_show (vbox_1);
-
-  if (empathy_import_accounts_to_import ())
-    {
-      hbox_1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (vbox_1), hbox_1, TRUE, TRUE, 0);
-      gtk_widget_show (hbox_1);
-
-      radio = gtk_radio_button_new_with_label (NULL,
-          _("Yes, import my account details from "));
-      gtk_box_pack_start (GTK_BOX (hbox_1), radio, TRUE, TRUE, 0);
-      g_object_set_data (G_OBJECT (radio), "response",
-          GINT_TO_POINTER (RESPONSE_IMPORT));
-      gtk_widget_show (radio);
-
-      w = gtk_combo_box_text_new ();
-      gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (w), "Pidgin");
-      gtk_box_pack_start (GTK_BOX (hbox_1), w, TRUE, TRUE, 0);
-      gtk_combo_box_set_active (GTK_COMBO_BOX (w), 0);
-      gtk_widget_show (w);
-
-      g_signal_connect (radio, "clicked",
-          G_CALLBACK (account_assistant_radio_choice_toggled_cb), self);
-      priv->first_resp = RESPONSE_IMPORT;
-    }
-  else
-    {
-      priv->first_resp = RESPONSE_ENTER_ACCOUNT;
-    }
-
-  str = _("Yes, I'll enter my account details now");
-
-  if (radio == NULL)
-    {
-      radio = gtk_radio_button_new_with_label (NULL, str);
-      w = radio;
-    }
-  else
-    {
-      w = gtk_radio_button_new_with_label_from_widget (
-          GTK_RADIO_BUTTON (radio), str);
-    }
-
-  gtk_box_pack_start (GTK_BOX (vbox_1), w, TRUE, TRUE, 0);
-  g_object_set_data (G_OBJECT (w), "response",
-      GINT_TO_POINTER (RESPONSE_ENTER_ACCOUNT));
-  gtk_widget_show (w);
-
-  g_signal_connect (w, "clicked",
-      G_CALLBACK (account_assistant_radio_choice_toggled_cb), self);
-
-  w = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio),
-      _("No, I want a new account"));
-  gtk_box_pack_start (GTK_BOX (vbox_1), w, TRUE, TRUE, 0);
-  g_object_set_data (G_OBJECT (w), "response",
-      GINT_TO_POINTER (RESPONSE_CREATE_ACCOUNT));
-  gtk_widget_show (w);
-
-  g_signal_connect (w, "clicked",
-      G_CALLBACK (account_assistant_radio_choice_toggled_cb), self);
-
-  w = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio),
-      _("No, I just want to see people online nearby for now"));
-  gtk_box_pack_start (GTK_BOX (vbox_1), w, TRUE, TRUE, 0);
-  g_object_set_data (G_OBJECT (w), "response",
-      GINT_TO_POINTER (RESPONSE_SALUT_ONLY));
-  gtk_widget_show (w);
-
-  g_signal_connect (w, "clicked",
-      G_CALLBACK (account_assistant_radio_choice_toggled_cb), self);
-
-  return main_vbox;
-}
-
-static GtkWidget *
-account_assistant_build_import_page (EmpathyAccountAssistant *self)
-{
-  GtkWidget *main_vbox, *w, *import;
-  EmpathyImportWidget *iw;
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-
-  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
-  w = gtk_label_new (_("Select the accounts you want to import:"));
-  gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
-  gtk_widget_show (w);
-  gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 6);
-
-  w = gtk_alignment_new (0, 0, 1, 1);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0);
-  gtk_box_pack_start (GTK_BOX (main_vbox), w, TRUE, TRUE, 0);
-  gtk_widget_show (w);
-
-  /* NOTE: this is hardcoded as we support pidgin only */
-  iw = empathy_import_widget_new (EMPATHY_IMPORT_APPLICATION_PIDGIN);
-  import = empathy_import_widget_get_widget (iw);
-  gtk_container_add (GTK_CONTAINER (w), import);
-  gtk_widget_show (import);
-
-  priv->iw = iw;
-
-  gtk_widget_show (main_vbox);
-
-  return main_vbox;
-}
-
-static void
-account_assistant_radio_create_again_clicked_cb (GtkButton *button,
-    EmpathyAccountAssistant *self)
-{
-  CreateEnterPageResponse response;
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-
-  response = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
-          "response"));
-
-  priv->create_enter_resp = response;
-
-  update_create_page_buttons (self);
-}
-
-static GtkWidget *
-account_assistant_build_enter_or_create_page (EmpathyAccountAssistant *self)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  GtkWidget *main_vbox, *w, *chooser, *vbox, *hbox, *radio;
-
-  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
-  gtk_widget_show (main_vbox);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-  gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
-  gtk_widget_show (hbox);
-
-  w = gtk_label_new (NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-  gtk_widget_show (w);
-  priv->first_label = w;
-
-  w = gtk_alignment_new (0, 0, 0, 0);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0);
-  gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0);
-  gtk_widget_show (w);
-
-  chooser = empathy_protocol_chooser_new ();
-  gtk_box_pack_start (GTK_BOX (hbox), chooser, FALSE, FALSE, 0);
-  gtk_widget_show (chooser);
-  priv->chooser = chooser;
-
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  gtk_box_pack_end (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
-  gtk_widget_show (vbox);
-
-  w = gtk_label_new (NULL);
-  gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
-  gtk_widget_show (w);
-  priv->second_label = w;
-
-  w = gtk_alignment_new (0, 0, 0, 0);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
-  gtk_widget_show (w);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-  gtk_container_add (GTK_CONTAINER (w), hbox);
-  gtk_widget_show (hbox);
-
-  radio = gtk_radio_button_new_with_label (NULL, _("Yes"));
-  gtk_box_pack_start (GTK_BOX (hbox), radio, FALSE, FALSE, 0);
-  g_object_set_data (G_OBJECT (radio), "response",
-      GINT_TO_POINTER (RESPONSE_CREATE_AGAIN));
-  gtk_widget_show (radio);
-
-  w = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio),
-      _("No, that's all for now"));
-  gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-  g_object_set_data (G_OBJECT (w), "response",
-      GINT_TO_POINTER (RESPONSE_CREATE_STOP));
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE);
-  priv->create_enter_resp = RESPONSE_CREATE_STOP;
-  priv->create_again_radio = w;
-  gtk_widget_show (w);
-
-  g_signal_connect (w, "clicked",
-      G_CALLBACK (account_assistant_radio_create_again_clicked_cb), self);
-  g_signal_connect (radio, "clicked",
-      G_CALLBACK (account_assistant_radio_create_again_clicked_cb), self);
-
-  return main_vbox;
-}
-
-static void
-account_assistant_close_cb (GtkAssistant *assistant,
-    gpointer user_data)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (assistant);
-
-  if (priv->is_creating)
-    return;
-
-  gtk_widget_destroy (GTK_WIDGET (assistant));
-}
-
-static void
-impl_signal_apply (GtkAssistant *assistant)
-{
-  EmpathyAccountAssistant *self = EMPATHY_ACCOUNT_ASSISTANT (assistant);
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  gint current_page;
-
-  current_page = gtk_assistant_get_current_page (assistant);
-
-  if (current_page == PAGE_SALUT)
-    {
-      if (priv->create_salut_account)
-        /* create_salut_account_settings() already set the display name of the
-         * account so there is no need to set it again. */
-        account_assistant_apply_account_and_finish (self, priv->salut_settings,
-            FALSE);
-      return;
-    }
-  else if (current_page >= PAGE_ENTER_CREATE &&
-      priv->settings != NULL &&
-      empathy_account_settings_is_valid (priv->settings))
-    {
-      account_assistant_apply_account_and_finish (self, priv->settings, TRUE);
-      g_object_unref (priv->settings);
-      priv->settings = NULL;
-    }
-  else if (current_page == PAGE_IMPORT)
-    {
-      empathy_import_widget_add_selected_accounts (priv->iw);
-    }
-}
-
-static void
-impl_signal_cancel (GtkAssistant *assistant)
-{
-  gtk_widget_destroy (GTK_WIDGET (assistant));
-}
-
-static void
-impl_signal_prepare (GtkAssistant *assistant,
-    GtkWidget *current_page)
-{
-  EmpathyAccountAssistant *self = EMPATHY_ACCOUNT_ASSISTANT (assistant);
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  gint current_idx;
-
-  /* check from which page we are coming from */
-  if (priv->current_page_id == PAGE_IMPORT)
-    empathy_import_widget_add_selected_accounts (priv->iw);
-
-  current_idx = gtk_assistant_get_current_page (assistant);
-  priv->current_page_id = current_idx;
-
-  if (current_idx >= PAGE_ENTER_CREATE)
-    {
-      if (!priv->enter_create_forward && current_idx != PAGE_SALUT)
-        {
-          account_assistant_finish_enter_or_create_page (self,
-              priv->first_resp == RESPONSE_ENTER_ACCOUNT ?
-              TRUE : FALSE);
-        }
-      else
-        {
-          priv->enter_create_forward = FALSE;
-        }
-
-      if (priv->settings != NULL &&
-          empathy_account_settings_is_valid (priv->settings))
-        {
-          account_assistant_apply_account_and_finish (self, priv->settings,
-              TRUE);
-          g_object_unref (priv->settings);
-          priv->settings = NULL;
-        }
-    }
-}
-
-static void
-do_get_property (GObject *object,
-    guint property_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (object);
-
-  switch (property_id)
-    {
-    case PROP_PARENT:
-      g_value_set_object (value, priv->parent_window);
-      break;
-    case PROP_CONNECTION_MGRS:
-      g_value_set_object (value, priv->connection_mgrs);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-do_set_property (GObject *object,
-    guint property_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (object);
-
-  switch (property_id)
-    {
-    case PROP_PARENT:
-      priv->parent_window = g_value_get_object (value);
-      break;
-    case PROP_CONNECTION_MGRS:
-      priv->connection_mgrs = g_value_dup_object (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-do_dispose (GObject *obj)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (obj);
-
-  if (priv->dispose_run)
-    return;
-
-  priv->dispose_run = TRUE;
-
-  if (priv->settings != NULL)
-    {
-      g_object_unref (priv->settings);
-      priv->settings = NULL;
-    }
-
-  g_object_unref (priv->account_mgr);
-  priv->account_mgr = NULL;
-
-  g_object_unref (priv->connection_mgrs);
-  priv->connection_mgrs = NULL;
-
-  if (G_OBJECT_CLASS (empathy_account_assistant_parent_class)->dispose != NULL)
-    G_OBJECT_CLASS (empathy_account_assistant_parent_class)->dispose (obj);
-}
-
-static void
-empathy_account_assistant_class_init (EmpathyAccountAssistantClass *klass)
-{
-  GObjectClass *oclass = G_OBJECT_CLASS (klass);
-  GtkAssistantClass *gtkclass = GTK_ASSISTANT_CLASS (klass);
-  GParamSpec *param_spec;
-
-  oclass->get_property = do_get_property;
-  oclass->set_property = do_set_property;
-  oclass->constructed = do_constructed;
-  oclass->dispose = do_dispose;
-
-  gtkclass->apply = impl_signal_apply;
-  gtkclass->prepare = impl_signal_prepare;
-  gtkclass->cancel = impl_signal_cancel;
-
-  param_spec = g_param_spec_object ("parent-window",
-      "parent-window", "The parent window",
-      GTK_TYPE_WINDOW,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (oclass, PROP_PARENT, param_spec);
-
-  param_spec = g_param_spec_object ("connection-managers",
-      "connection-managers", "A EmpathyConnectionManagers",
-      EMPATHY_TYPE_CONNECTION_MANAGERS,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (oclass, PROP_CONNECTION_MGRS, param_spec);
-
-  g_type_class_add_private (klass, sizeof (EmpathyAccountAssistantPriv));
-}
-
-static void
-create_salut_check_box_toggled_cb (GtkWidget *widget,
-    EmpathyAccountAssistant *self)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  gboolean sensitive;
-  gboolean page_valid;
-
-  sensitive = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-
-  gtk_widget_set_sensitive (priv->salut_account_widget, sensitive);
-
-  if (!sensitive)
-    {
-      page_valid = TRUE;
-      priv->create_salut_account = FALSE;
-    }
-  else
-    {
-      /* page is complete if the account is valid */
-      page_valid = empathy_account_settings_is_valid (priv->salut_settings);
-      priv->create_salut_account = TRUE;
-    }
-
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (self), priv->salut_page,
-      page_valid);
-}
-
-static void
-account_assistant_salut_handle_apply_cb (EmpathyAccountWidget *widget_object,
-    gboolean is_valid,
-    EmpathyAccountAssistant *self)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (self),
-      priv->salut_page, is_valid);
-}
-
-static GtkWidget *
-account_assistant_build_salut_page (EmpathyAccountAssistant *self)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  GtkWidget *main_vbox, *hbox_1, *w;
-  GdkPixbuf *pix;
-  EmpathyAccountSettings *settings;
-  GtkWidget *account_widget;
-  EmpathyAccountWidget *widget_object;
-  gchar *markup;
-
-  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_widget_show (main_vbox);
-  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
-
-  hbox_1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  gtk_box_pack_start (GTK_BOX (main_vbox), hbox_1, TRUE, TRUE, 0);
-  gtk_widget_show (hbox_1);
-
-  w = gtk_label_new (NULL);
-  markup = g_strdup_printf ("%s (<span style=\"italic\">%s</span>).",
-      _("Empathy can automatically discover and chat with the people "
-        "connected on the same network as you. "
-        "If you want to use this feature, please check that the "
-        "details below are correct. "
-        "You can easily change these details later or disable this feature "
-        "by using the 'Accounts' dialog"),
-      _("Edit->Accounts"));
-  gtk_label_set_markup (GTK_LABEL (w), markup);
-  g_free (markup);
-  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox_1), w, FALSE, FALSE, 0);
-  gtk_widget_show (w);
-
-  pix = empathy_pixbuf_from_icon_name_sized ("im-local-xmpp", 80);
-  w = gtk_image_new_from_pixbuf (pix);
-  gtk_box_pack_start (GTK_BOX (hbox_1), w, FALSE, FALSE, 6);
-  gtk_widget_show (w);
-
-  g_object_unref (pix);
-
-  w = gtk_check_button_new_with_mnemonic (
-      _("I do _not want to enable this feature for now"));
-  gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0);
-  g_signal_connect (w, "toggled",
-      G_CALLBACK (create_salut_check_box_toggled_cb), self);
-  gtk_widget_show (w);
-
-  w = gtk_alignment_new (0, 0, 0, 0);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0);
-  gtk_box_pack_start (GTK_BOX (main_vbox), w, TRUE, TRUE, 0);
-  gtk_widget_show (w);
-
-  settings = create_salut_account_settings ();
-
-  widget_object = empathy_account_widget_new_for_protocol (settings, TRUE);
-  account_widget = empathy_account_widget_get_widget (widget_object);
-
-  priv->salut_settings = settings;
-  priv->salut_account_widget = account_widget;
-
-  g_signal_connect (widget_object, "handle-apply",
-      G_CALLBACK (account_assistant_salut_handle_apply_cb), self);
-
-  gtk_box_pack_start (GTK_BOX (main_vbox), account_widget,
-      FALSE, FALSE, 0);
-  gtk_widget_show (account_widget);
-
-  return main_vbox;
-}
-
-static GtkWidget *
-account_assistant_build_salut_error_page (EmpathyAccountAssistant *self)
-{
-  GtkWidget *vbox;
-  gchar *markup;
-
-  markup = g_strdup_printf ("%s (<span style=\"italic\">%s</span>).",
-      _("You won't be able to chat with people connected to your local "
-        "network, as telepathy-salut is not installed. If you want to enable "
-        "this feature, please install the telepathy-salut package and create "
-        "a People Nearby account from the Accounts dialog"),
-        _("Edit->Accounts"));
-
-  vbox = build_error_vbox (_("telepathy-salut not installed"), markup);
-  g_free (markup);
-  return vbox;
-}
-
-static void
-account_mgr_prepare_cb (GObject *source_object,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyAccountAssistant *self = user_data;
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
-  TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
-  GError *error = NULL;
-
-  if (!tp_proxy_prepare_finish (manager, result, &error))
-    {
-      DEBUG ("Failed to prepare account manager: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  if (!should_create_salut_account (manager))
-    {
-      DEBUG ("No need to create a Salut account");
-      priv->display_salut_page = FALSE;
-
-      update_intro_page_buttons (self);
-
-      gtk_assistant_set_page_type (GTK_ASSISTANT (self), priv->import_page,
-          GTK_ASSISTANT_PAGE_CONFIRM);
-
-      update_create_page_buttons (self);
-    }
-}
-
-static void
-empathy_account_assistant_init (EmpathyAccountAssistant *self)
-{
-  EmpathyAccountAssistantPriv *priv;
-
-  priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_ACCOUNT_ASSISTANT,
-      EmpathyAccountAssistantPriv);
-  self->priv = priv;
-
-  gtk_window_set_title (GTK_WINDOW (self),
-      _("Messaging and VoIP Accounts Assistant"));
-
-  priv->account_mgr = tp_account_manager_dup ();
-}
-
-static void
-do_constructed (GObject *object)
-{
-  GtkAssistant *assistant = GTK_ASSISTANT (object);
-  EmpathyAccountAssistant *self = EMPATHY_ACCOUNT_ASSISTANT (object);
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (object);
-  GtkWidget *page;
-
-  /* set us as transient for the parent window if any */
-  if (priv->parent_window)
-    gtk_window_set_transient_for (GTK_WINDOW (object),
-        priv->parent_window);
-
-  /* set the dialog hint, so this will be centered over the parent window */
-  gtk_window_set_type_hint (GTK_WINDOW (object), GDK_WINDOW_TYPE_HINT_DIALOG);
-
-  g_assert (priv->connection_mgrs != NULL);
-  g_assert (empathy_connection_managers_is_ready (priv->connection_mgrs));
-
-  g_signal_connect (self, "close",
-      G_CALLBACK (account_assistant_close_cb), NULL);
-
-  gtk_assistant_set_forward_page_func (assistant,
-      account_assistant_page_forward_func, self, NULL);
-
-  /* first page (introduction) */
-  page = account_assistant_build_introduction_page (self);
-  gtk_assistant_append_page (assistant, page);
-  gtk_assistant_set_page_title (assistant, page,
-      _("Welcome to Empathy"));
-  gtk_assistant_set_page_type (assistant, page,
-      GTK_ASSISTANT_PAGE_INTRO);
-  gtk_assistant_set_page_complete (assistant, page, TRUE);
-
-  /* second page (import accounts) */
-  page = account_assistant_build_import_page (self);
-  gtk_assistant_append_page (assistant, page);
-  gtk_assistant_set_page_title (assistant, page,
-      _("Import your existing accounts"));
-  gtk_assistant_set_page_complete (assistant, page, TRUE);
-  gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONTENT);
-  priv->import_page = page;
-
-  /* third page (enter account details) */
-  page = account_assistant_build_enter_or_create_page (self);
-  gtk_assistant_append_page (assistant, page);
-  gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONTENT);
-  priv->enter_or_create_page = page;
-
-  /* fourth page (salut details) */
-  if (empathy_connection_managers_get_cm (priv->connection_mgrs, "salut")
-      != NULL)
-    {
-      page = account_assistant_build_salut_page (self);
-      gtk_assistant_append_page (assistant, page);
-      gtk_assistant_set_page_title (assistant, page,
-          _("Please enter personal details"));
-      gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONFIRM);
-
-      priv->create_salut_account = TRUE;
-
-      if (empathy_account_settings_is_valid (priv->salut_settings))
-        {
-          gtk_assistant_set_page_complete (GTK_ASSISTANT (self),
-              page, TRUE);
-        }
-    }
-  else
-    {
-      page = account_assistant_build_salut_error_page (self);
-      gtk_assistant_append_page (assistant, page);
-      gtk_assistant_set_page_title (assistant, page, _("An error occurred"));
-      gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_SUMMARY);
-
-      priv->create_salut_account = FALSE;
-    }
-
-  priv->salut_page = page;
-  priv->display_salut_page = TRUE;
-
-  tp_proxy_prepare_async (priv->account_mgr, NULL,
-      account_mgr_prepare_cb, self);
-
-  gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
-}
-
-GtkWidget *
-empathy_account_assistant_show (GtkWindow *window,
-    EmpathyConnectionManagers *connection_mgrs)
-{
-  static GtkWidget *dialog = NULL;
-
-  if (dialog == NULL)
-    {
-      dialog = g_object_new (EMPATHY_TYPE_ACCOUNT_ASSISTANT,
-          "parent-window", window,
-          "connection-managers", connection_mgrs,
-          NULL);
-      g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer *) &dialog);
-    }
-
-  gtk_window_present (GTK_WINDOW (dialog));
-
-  return dialog;
-}
-
-
diff --git a/src/empathy-account-assistant.h b/src/empathy-account-assistant.h
deleted file mode 100644
index d99475fe3..000000000
--- a/src/empathy-account-assistant.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2009 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
- */
-
-/* empathy-account-assistant.h */
-
-#ifndef __EMPATHY_ACCOUNT_ASSISTANT_H__
-#define __EMPATHY_ACCOUNT_ASSISTANT_H__
-
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-connection-managers.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_ACCOUNT_ASSISTANT empathy_account_assistant_get_type()
-#define EMPATHY_ACCOUNT_ASSISTANT(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_ACCOUNT_ASSISTANT,\
-      EmpathyAccountAssistant))
-#define EMPATHY_ACCOUNT_ASSISTANT_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), EMPATHY_TYPE_ACCOUNT_ASSISTANT,\
-      EmpathyAccountAssistantClass))
-#define EMPATHY_IS_ACCOUNT_ASSISTANT(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_ACCOUNT_ASSISTANT))
-#define EMPATHY_IS_ACCOUNT_ASSISTANT_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_ACCOUNT_ASSISTANT))
-#define EMPATHY_ACCOUNT_ASSISTANT_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_ACCOUNT_ASSISTANT,\
-      EmpathyAccountAssistantClass))
-
-typedef struct {
-  GtkAssistant parent;
-
-  /* private */
-  gpointer priv;
-} EmpathyAccountAssistant;
-
-typedef struct {
-  GtkAssistantClass parent_class;
-} EmpathyAccountAssistantClass;
-
-GType empathy_account_assistant_get_type (void);
-
-GtkWidget *empathy_account_assistant_show (GtkWindow *parent,
-    EmpathyConnectionManagers *connection_mgrs);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_ACCOUNT_ASSISTANT_H__ */
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index 88d14c321..f6bb40278 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -41,8 +41,6 @@
 
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
-#include "empathy-account-assistant.h"
-#include "empathy-auto-salut-account-helper.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include <libempathy/empathy-debug.h>
@@ -82,13 +80,16 @@ empathy_accounts_has_accounts (TpAccountManager *manager)
   return has_accounts;
 }
 
-static void
-do_show_accounts_ui (TpAccountManager *manager,
+void
+empathy_accounts_show_accounts_ui (TpAccountManager *manager,
     TpAccount *account,
     GApplication *app)
 {
   static GtkWidget *accounts_window = NULL;
 
+  g_return_if_fail (TP_IS_ACCOUNT_MANAGER (manager));
+  g_return_if_fail (!account || TP_IS_ACCOUNT (account));
+
   if (accounts_window == NULL)
     {
       accounts_window = empathy_accounts_dialog_show (NULL, account);
@@ -99,63 +100,3 @@ do_show_accounts_ui (TpAccountManager *manager,
 
   gtk_window_present (GTK_WINDOW (accounts_window));
 }
-
-static GtkWidget *
-show_account_assistant (EmpathyConnectionManagers *connection_mgrs,
-    GApplication *app)
-{
-  GtkWidget *assistant;
-
-  assistant = empathy_account_assistant_show (NULL, connection_mgrs);
-
-  gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (assistant));
-
-  return assistant;
-}
-
-static void
-connection_managers_prepare_for_accounts (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyConnectionManagers *cm_mgr = EMPATHY_CONNECTION_MANAGERS (source);
-  GApplication *app = user_data;
-
-  if (!empathy_connection_managers_prepare_finish (cm_mgr, result, NULL))
-    goto out;
-
-  show_account_assistant (cm_mgr, app);
-  DEBUG ("would show the account assistant");
-
-out:
-  g_object_unref (cm_mgr);
-  g_application_release (app);
-}
-
-void
-empathy_accounts_show_accounts_ui (TpAccountManager *manager,
-    TpAccount *account,
-    gboolean assistant,
-    GApplication *app)
-{
-  g_return_if_fail (TP_IS_ACCOUNT_MANAGER (manager));
-  g_return_if_fail (!account || TP_IS_ACCOUNT (account));
-
-  if ((empathy_accounts_has_non_salut_accounts (manager) && !assistant) ||
-          account != NULL)
-    {
-      do_show_accounts_ui (manager, account, app);
-    }
-  else
-    {
-      EmpathyConnectionManagers *cm_mgr;
-
-      cm_mgr = empathy_connection_managers_dup_singleton ();
-
-      /* Hold the application while preparing cm_mgr */
-      g_application_hold (app);
-
-      empathy_connection_managers_prepare_async (cm_mgr,
-          connection_managers_prepare_for_accounts, app);
-    }
-}
diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h
index f9294fbd2..39d094d22 100644
--- a/src/empathy-accounts-common.h
+++ b/src/empathy-accounts-common.h
@@ -28,7 +28,6 @@ gboolean empathy_accounts_has_accounts (TpAccountManager *manager);
 
 void empathy_accounts_show_accounts_ui (TpAccountManager *manager,
     TpAccount *account,
-    gboolean assistant,
     GApplication *app);
 
 #endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 0e33de2a6..b2b57dec1 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -51,8 +51,10 @@
 #include <libempathy-gtk/empathy-cell-renderer-activatable.h>
 #include <libempathy-gtk/empathy-contact-widget.h>
 #include <libempathy-gtk/empathy-images.h>
+#include <libempathy-gtk/empathy-local-xmpp-assistant-widget.h>
 #include <libempathy-gtk/empathy-new-account-dialog.h>
 
+#include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
 #include "empathy-import-dialog.h"
 #include "empathy-import-utils.h"
@@ -78,7 +80,8 @@ G_DEFINE_TYPE (EmpathyAccountsDialog, empathy_accounts_dialog, GTK_TYPE_DIALOG);
 enum
 {
   NOTEBOOK_PAGE_ACCOUNT = 0,
-  NOTEBOOK_PAGE_LOADING
+  NOTEBOOK_PAGE_LOADING,
+  NOTEBOOK_PAGE_NO_PROTOCOL
 };
 
 typedef struct {
@@ -91,7 +94,6 @@ typedef struct {
   GtkWidget *image_status;
   GtkWidget *throbber;
   GtkWidget *enabled_switch;
-  GtkWidget *frame_no_protocol;
 
   GtkWidget *treeview;
 
@@ -99,8 +101,6 @@ typedef struct {
   GtkWidget *button_remove;
   GtkWidget *button_import;
 
-  GtkWidget *hbox_protocol;
-
   GtkWidget *image_type;
   GtkWidget *label_name;
   GtkWidget *label_type;
@@ -161,21 +161,13 @@ enum {
 static EmpathyAccountSettings * accounts_dialog_model_get_selected_settings (
     EmpathyAccountsDialog *dialog);
 
-static gboolean accounts_dialog_get_settings_iter (
-    EmpathyAccountsDialog *dialog,
-    EmpathyAccountSettings *settings,
-    GtkTreeIter *iter);
-
 static void accounts_dialog_model_select_first (EmpathyAccountsDialog *dialog);
 
 static void accounts_dialog_update_settings (EmpathyAccountsDialog *dialog,
     EmpathyAccountSettings *settings);
 
-static void accounts_dialog_add (EmpathyAccountsDialog *dialog,
-    EmpathyAccountSettings *settings);
-
 static void accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
-    EmpathyAccountSettings *settings);
+    TpAccount *account);
 
 static void accounts_dialog_connection_changed_cb (TpAccount *account,
     guint old_status,
@@ -220,6 +212,9 @@ accounts_dialog_status_infobar_set_message (EmpathyAccountsDialog *dialog,
 
   message_markup = g_markup_printf_escaped ("<i>%s</i>", message);
   gtk_label_set_markup (GTK_LABEL (priv->label_status), message_markup);
+
+  gtk_widget_set_tooltip_text (priv->label_status, message);
+
   g_free (message_markup);
 }
 
@@ -940,12 +935,16 @@ accounts_dialog_button_add_clicked_cb (GtkWidget *button,
   if (response == GTK_RESPONSE_OK)
     {
       EmpathyAccountSettings *settings;
+      TpAccount *account;
 
       settings = empathy_new_account_dialog_get_settings (
           EMPATHY_NEW_ACCOUNT_DIALOG (dialog));
 
-      accounts_dialog_add (self, settings);
-      accounts_dialog_model_set_selected (self, settings);
+      /* The newly created account has already been added by
+       * accounts_dialog_account_validity_changed_cb so we just
+       * have to select it. */
+      account = empathy_account_settings_get_account (settings);
+      accounts_dialog_model_set_selected (self, account);
     }
 
   gtk_widget_destroy (dialog);
@@ -984,28 +983,19 @@ accounts_dialog_update_settings (EmpathyAccountsDialog *dialog,
 
           return;
         }
-      if (empathy_connection_managers_get_cms_num (priv->cms) > 0)
-        {
-          /* We have no account configured but we have some
-           * profiles installed. The user obviously wants to add
-           * an account. Click on the Add button for him. */
-          accounts_dialog_button_add_clicked_cb (priv->button_add,
-              dialog);
-          return;
-        }
 
       /* No account and no profile, warn the user */
       gtk_widget_hide (priv->vbox_details);
-      gtk_widget_show (priv->frame_no_protocol);
       gtk_widget_set_sensitive (priv->button_add, FALSE);
+
+      gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook_account),
+          NOTEBOOK_PAGE_NO_PROTOCOL);
       return;
     }
 
   /* We have an account selected, destroy old settings and create a new
    * one for the account selected */
-  gtk_widget_hide (priv->frame_no_protocol);
   gtk_widget_show (priv->vbox_details);
-  gtk_widget_hide (priv->hbox_protocol);
 
   if (priv->dialog_content)
     {
@@ -1585,41 +1575,6 @@ accounts_dialog_model_setup (EmpathyAccountsDialog *dialog)
 }
 
 static gboolean
-accounts_dialog_get_settings_iter (EmpathyAccountsDialog *dialog,
-    EmpathyAccountSettings *settings,
-    GtkTreeIter *iter)
-{
-  GtkTreeView      *view;
-  GtkTreeModel     *model;
-  gboolean          ok;
-  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
-  /* Update the status in the model */
-  view = GTK_TREE_VIEW (priv->treeview);
-  model = gtk_tree_view_get_model (view);
-
-  for (ok = gtk_tree_model_get_iter_first (model, iter);
-       ok;
-       ok = gtk_tree_model_iter_next (model, iter))
-    {
-      EmpathyAccountSettings *this_settings;
-      gboolean   equal;
-
-      gtk_tree_model_get (model, iter,
-          COL_ACCOUNT_SETTINGS, &this_settings,
-          -1);
-
-      equal = (this_settings == settings);
-      g_object_unref (this_settings);
-
-      if (equal)
-        return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
 accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog,
     TpAccount *account,
     GtkTreeIter *iter)
@@ -1637,15 +1592,15 @@ accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog,
        ok;
        ok = gtk_tree_model_iter_next (model, iter))
     {
-      EmpathyAccountSettings *settings;
+      TpAccount *this_account;
       gboolean   equal;
 
       gtk_tree_model_get (model, iter,
-          COL_ACCOUNT_SETTINGS, &settings,
+          COL_ACCOUNT, &this_account,
           -1);
 
-      equal = empathy_account_settings_has_account (settings, account);
-      g_object_unref (settings);
+      equal = (this_account == account);
+      g_object_unref (this_account);
 
       if (equal)
         return TRUE;
@@ -1678,11 +1633,11 @@ select_and_scroll_to_iter (EmpathyAccountsDialog *dialog,
 
 static void
 accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
-    EmpathyAccountSettings *settings)
+    TpAccount *account)
 {
   GtkTreeIter       iter;
 
-  if (accounts_dialog_get_settings_iter (dialog, settings, &iter))
+  if (accounts_dialog_get_account_iter (dialog, account, &iter))
     select_and_scroll_to_iter (dialog, &iter);
 }
 
@@ -1781,27 +1736,6 @@ finally:
 }
 
 static void
-accounts_dialog_add (EmpathyAccountsDialog *dialog,
-    EmpathyAccountSettings *settings)
-{
-  GtkTreeModel       *model;
-  GtkTreeIter         iter;
-  const gchar        *name;
-  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
-  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
-  name = empathy_account_settings_get_display_name (settings);
-
-  gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-
-  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-      COL_NAME, name,
-      COL_STATUS, TP_CONNECTION_STATUS_DISCONNECTED,
-      COL_ACCOUNT_SETTINGS, settings,
-      -1);
-}
-
-static void
 accounts_dialog_connection_changed_cb (TpAccount *account,
     guint old_status,
     guint current,
@@ -1925,6 +1859,7 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog,
   const gchar        *name;
   EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
   gboolean selected = FALSE;
+  GtkTreeSelection *selection;
 
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
   status = tp_account_get_connection_status (account, NULL);
@@ -1932,15 +1867,18 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog,
 
   settings = empathy_account_settings_new_for_account (account);
 
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+
   if (!accounts_dialog_get_account_iter (dialog, account, &iter))
     {
+      /* Select the account if it's the first added */
+      if (gtk_tree_selection_count_selected_rows (selection) == 0)
+        selected = TRUE;
+
       gtk_list_store_append (GTK_LIST_STORE (model), &iter);
     }
   else
     {
-      GtkTreeSelection *selection;
-
-      selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
       selected = gtk_tree_selection_iter_is_selected (selection, &iter);
     }
 
@@ -1980,31 +1918,12 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog,
 }
 
 static void
-account_prepare_cb (GObject *source_object,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (user_data);
-  TpAccount *account = TP_ACCOUNT (source_object);
-  GError *error = NULL;
-
-  if (!tp_proxy_prepare_finish (account, result, &error))
-    {
-      DEBUG ("Failed to prepare account: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  accounts_dialog_add_account (dialog, account);
-}
-
-static void
 accounts_dialog_account_validity_changed_cb (TpAccountManager *manager,
     TpAccount *account,
     gboolean valid,
     EmpathyAccountsDialog *dialog)
 {
-  tp_proxy_prepare_async (account, NULL, account_prepare_cb, dialog);
+  accounts_dialog_add_account (dialog, account);
 }
 
 static void
@@ -2083,15 +2002,24 @@ accounts_dialog_account_enabled_cb (TpAccountManager *manager,
   enable_or_disable_account (dialog, account, TRUE);
 }
 
-static void
-accounts_dialog_button_import_clicked_cb (GtkWidget *button,
-    EmpathyAccountsDialog *dialog)
+static GtkWidget *
+display_import_dialog (EmpathyAccountsDialog *dialog)
 {
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
   GtkWidget *import_dialog;
 
   import_dialog = empathy_import_dialog_new (GTK_WINDOW (dialog),
-      FALSE);
+      FALSE, priv->cms);
   gtk_widget_show (import_dialog);
+
+  return import_dialog;
+}
+
+static void
+accounts_dialog_button_import_clicked_cb (GtkWidget *button,
+    EmpathyAccountsDialog *dialog)
+{
+  display_import_dialog (dialog);
 }
 
 static void
@@ -2127,6 +2055,85 @@ accounts_dialog_set_selected_account (EmpathyAccountsDialog *dialog,
 }
 
 static void
+salut_valid_cb (GtkWidget *widget,
+    gboolean valid,
+    GtkWidget *button)
+{
+  gtk_widget_set_sensitive (button, valid);
+}
+
+static void
+maybe_show_salut_dialog (EmpathyAccountsDialog *self)
+{
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (self);
+  GtkWidget *dialog, *widget, *content, *button;
+  gint response;
+
+  if (!empathy_local_xmpp_assistant_widget_should_create_account (
+        priv->account_manager))
+    return;
+
+  widget = empathy_local_xmpp_assistant_widget_new ();
+  gtk_widget_show (widget);
+
+  dialog = gtk_dialog_new ();
+
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+  gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Skip"),
+      GTK_RESPONSE_NO);
+
+  button = gtk_dialog_add_button (GTK_DIALOG (dialog),
+      _("_Connect"), GTK_RESPONSE_YES);
+  gtk_widget_set_sensitive (button, FALSE);
+
+  g_signal_connect (widget, "valid", G_CALLBACK (salut_valid_cb),
+      button);
+
+  content = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+  gtk_box_pack_start (GTK_BOX (content), widget, TRUE, TRUE, 0);
+
+  response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+  if (response == GTK_RESPONSE_YES)
+    {
+      empathy_local_xmpp_assistant_widget_create_account (
+          EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET (widget));
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+import_dialog_response_cb (GtkDialog *dialog,
+    gint response_id,
+    EmpathyAccountsDialog *self)
+{
+  maybe_show_salut_dialog (self);
+}
+
+static void
+maybe_show_import_dialog (EmpathyAccountsDialog *self)
+{
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (self);
+  GtkWidget *dialog;
+
+  if (empathy_accounts_has_non_salut_accounts (priv->account_manager))
+    return;
+
+  if (!empathy_import_accounts_to_import ())
+    {
+      maybe_show_salut_dialog (self);
+      return;
+    }
+
+  dialog = display_import_dialog (self);
+
+  tp_g_signal_connect_object (dialog, "response",
+      G_CALLBACK (import_dialog_response_cb), self, 0);
+}
+
+static void
 finished_loading (EmpathyAccountsDialog *self)
 {
   EmpathyAccountsDialogPriv *priv = GET_PRIV (self);
@@ -2147,6 +2154,8 @@ finished_loading (EmpathyAccountsDialog *self)
   gtk_spinner_stop (GTK_SPINNER (priv->spinner));
   gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook_account),
       NOTEBOOK_PAGE_ACCOUNT);
+
+  maybe_show_import_dialog (self);
 }
 
 static void
@@ -2289,14 +2298,12 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
   gui = empathy_builder_get_file (filename,
       "accounts_dialog_hbox", &top_hbox,
       "vbox_details", &priv->vbox_details,
-      "frame_no_protocol", &priv->frame_no_protocol,
       "alignment_settings", &priv->alignment_settings,
       "alignment_infobar", &priv->alignment_infobar,
       "treeview", &priv->treeview,
       "button_add", &priv->button_add,
       "button_remove", &priv->button_remove,
       "button_import", &priv->button_import,
-      "hbox_protocol", &priv->hbox_protocol,
       "notebook_account", &priv->notebook_account,
       "alignment_loading", &alig,
       "accounts_sw", &sw,
@@ -2304,8 +2311,6 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
       NULL);
   g_free (filename);
 
-  gtk_widget_set_no_show_all (priv->frame_no_protocol, TRUE);
-
   empathy_builder_connect (gui, dialog,
       "button_add", "clicked", accounts_dialog_button_add_clicked_cb,
       "button_remove", "clicked", accounts_dialog_button_remove_clicked_cb,
@@ -2387,7 +2392,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
             TP_CONNECTION_PRESENCE_TYPE_OFFLINE), GTK_ICON_SIZE_SMALL_TOOLBAR);
 
   priv->label_status = gtk_label_new (NULL);
-  gtk_label_set_line_wrap (GTK_LABEL (priv->label_status), TRUE);
+  gtk_label_set_ellipsize (GTK_LABEL (priv->label_status), PANGO_ELLIPSIZE_END);
 
   gtk_box_pack_start (GTK_BOX (hbox), priv->throbber, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), priv->image_status, FALSE, FALSE, 0);
diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui
index 4a1b8bbb3..549a92651 100644
--- a/src/empathy-accounts-dialog.ui
+++ b/src/empathy-accounts-dialog.ui
@@ -112,31 +112,6 @@
             <property name="visible">True</property>
             <property name="spacing">18</property>
             <child>
-              <object class="GtkHBox" id="hbox_protocol">
-                <property name="visible">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="label_protocol">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Protocol:</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkVBox" id="vbox_details">
                 <property name="visible">True</property>
                 <property name="spacing">18</property>
@@ -173,43 +148,6 @@
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkFrame" id="frame_no_protocol">
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment21">
-                    <property name="visible">True</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">To add a new account, you first have to install a backend for each protocol you want to use.</property>
-                        <property name="wrap">True</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label_no_protocol">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">No protocol installed</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
         </child>
         <child type="tab">
@@ -254,6 +192,49 @@
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkVBox" id="vbox_no_protocol">
+            <property name="visible">True</property>
+            <property name="spacing">18</property>
+            <child>
+              <object class="GtkFrame" id="frame_no_protocol">
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment21">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">To add a new account, you first have to install a backend for each protocol you want to use.</property>
+                        <property name="wrap">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label_no_protocol">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">No protocol backends installed</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+        </child>
       </object>
       <packing>
         <property name="position">1</property>
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 3b25201c5..6b51820f7 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -43,8 +43,6 @@
 #include "empathy-accounts.h"
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
-#include "empathy-account-assistant.h"
-#include "empathy-auto-salut-account-helper.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include <libempathy/empathy-debug.h>
@@ -54,7 +52,6 @@
 static gboolean only_if_needed = FALSE;
 static gboolean hidden = FALSE;
 static gchar *selected_account_name = NULL;
-static gboolean assistant = FALSE;
 
 static void
 maybe_show_accounts_ui (TpAccountManager *manager,
@@ -66,7 +63,7 @@ maybe_show_accounts_ui (TpAccountManager *manager,
   if (only_if_needed && empathy_accounts_has_non_salut_accounts (manager))
     return;
 
-  empathy_accounts_show_accounts_ui (manager, NULL, assistant, app);
+  empathy_accounts_show_accounts_ui (manager, NULL, app);
 }
 
 static TpAccount *
@@ -123,7 +120,7 @@ account_manager_ready_for_accounts_cb (GObject *source_object,
 
       if (account != NULL)
         {
-          empathy_accounts_show_accounts_ui (manager, account, assistant, app);
+          empathy_accounts_show_accounts_ui (manager, account, app);
           goto out;
         }
       else
@@ -191,10 +188,6 @@ local_cmdline (GApplication *app,
         N_("Initially select given account (eg, "
             "gabble/jabber/foo_40example_2eorg0)"),
         N_("<account-id>") },
-      { "assistant", 'a',
-        0, G_OPTION_ARG_NONE, &assistant,
-        N_("Show account assistant"),
-        NULL },
 
       { NULL }
   };
diff --git a/src/empathy-auto-salut-account-helper.c b/src/empathy-auto-salut-account-helper.c
deleted file mode 100644
index 409b6936c..000000000
--- a/src/empathy-auto-salut-account-helper.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2007-2010 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-
-#if HAVE_EDS
-#include <libebook/e-book.h>
-#endif
-
-#include <libempathy/empathy-account-settings.h>
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-auto-salut-account-helper.h"
-
-/* Salut account creation. The TpAccountManager first argument
- * must already be prepared when calling this function. */
-gboolean
-should_create_salut_account (TpAccountManager *manager)
-{
-  gboolean salut_created = FALSE;
-  GList *accounts, *l;
-
-  accounts = tp_account_manager_get_valid_accounts (manager);
-
-  for (l = accounts; l != NULL;  l = g_list_next (l))
-    {
-      TpAccount *account = TP_ACCOUNT (l->data);
-
-      if (!tp_strdiff (tp_account_get_protocol (account), "local-xmpp"))
-        {
-          salut_created = TRUE;
-          break;
-        }
-    }
-
-  g_list_free (accounts);
-
-  return !salut_created;
-}
-
-EmpathyAccountSettings *
-create_salut_account_settings (void)
-{
-  EmpathyAccountSettings  *settings;
-#if HAVE_EDS
-  EBook *book;
-  EContact *contact;
-  gchar *nickname = NULL;
-  gchar *first_name = NULL;
-  gchar *last_name = NULL;
-  gchar *email = NULL;
-  gchar *jid = NULL;
-  GError *error = NULL;
-#endif
-
-  settings = empathy_account_settings_new ("salut", "local-xmpp", NULL,
-      _("People nearby"));
-
-#if HAVE_EDS
-  /* Get self EContact from EDS */
-  if (!e_book_get_self (&contact, &book, &error))
-    {
-      DEBUG ("Failed to get self econtact: %s", error->message);
-      g_error_free (error);
-      return settings;
-    }
-
-  nickname = e_contact_get (contact, E_CONTACT_NICKNAME);
-  first_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME);
-  last_name = e_contact_get (contact, E_CONTACT_FAMILY_NAME);
-  email = e_contact_get (contact, E_CONTACT_EMAIL_1);
-  jid = e_contact_get (contact, E_CONTACT_IM_JABBER_HOME_1);
-
-  if (!tp_strdiff (nickname, "nickname"))
-    {
-      g_free (nickname);
-      nickname = NULL;
-    }
-
-  DEBUG ("Salut account created:\nnickname=%s\nfirst-name=%s\n"
-     "last-name=%s\nemail=%s\njid=%s\n",
-     nickname, first_name, last_name, email, jid);
-
-  empathy_account_settings_set_string (settings,
-      "nickname", nickname ? nickname : "");
-  empathy_account_settings_set_string (settings,
-      "first-name", first_name ? first_name : "");
-  empathy_account_settings_set_string (settings,
-      "last-name", last_name ? last_name : "");
-  empathy_account_settings_set_string (settings, "email", email ? email : "");
-  empathy_account_settings_set_string (settings, "jid", jid ? jid : "");
-
-  g_free (nickname);
-  g_free (first_name);
-  g_free (last_name);
-  g_free (email);
-  g_free (jid);
-  g_object_unref (contact);
-  g_object_unref (book);
-#endif
-
-  return settings;
-}
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index dc3c65358..51732e024 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -396,8 +396,11 @@ create_video_output_widget (EmpathyCallWindow *self)
   clutter_texture_set_keep_aspect_ratio (CLUTTER_TEXTURE (priv->video_output),
       TRUE);
 
-  priv->video_output_sink = clutter_gst_video_sink_new (
-      CLUTTER_TEXTURE (priv->video_output));
+  priv->video_output_sink = gst_element_factory_make ("cluttersink", NULL);
+  if (priv->video_output_sink == NULL)
+    g_error ("Missing cluttersink");
+  else
+    g_object_set (priv->video_output_sink, "texture", priv->video_output, NULL);
 
   clutter_container_add_actor (CLUTTER_CONTAINER (priv->video_box),
       priv->video_output);
@@ -1070,8 +1073,12 @@ create_video_preview (EmpathyCallWindow *self)
   preview = empathy_rounded_texture_new ();
   clutter_actor_set_size (preview,
       SELF_VIDEO_SECTION_WIDTH, SELF_VIDEO_SECTION_HEIGHT);
-  priv->video_preview_sink = clutter_gst_video_sink_new (
-      CLUTTER_TEXTURE (preview));
+
+  priv->video_preview_sink = gst_element_factory_make ("cluttersink", NULL);
+  if (priv->video_preview_sink == NULL)
+    g_error ("Missing cluttersink");
+  else
+    g_object_set (priv->video_preview_sink, "texture", preview, NULL);
 
   /* Add a little offset to the video preview */
   layout = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER,
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 21b751df9..5f45d1ee5 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -30,6 +30,10 @@
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
 
+#ifdef CLUTTER_WINDOWING_X11
+#include <X11/Xlib.h>
+#endif
+
 #include <telepathy-glib/debug-sender.h>
 
 #include <libempathy/empathy-client-factory.h>
@@ -185,6 +189,12 @@ main (int argc,
   /* Init */
   g_thread_init (NULL);
 
+#ifdef GDK_WINDOWING_X11
+  /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice
+   * but to intiialise X11 threading ourself */
+  XInitThreads ();
+#endif
+
   /* Clutter needs this */
   gdk_disable_multidevice ();
 
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 1bb9de4aa..ccf22ff01 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -47,6 +47,7 @@
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-request-util.h>
+#include <libempathy/empathy-individual-manager.h>
 
 #include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/empathy-contact-dialogs.h>
@@ -129,12 +130,14 @@ static const guint tab_accel_keys[] = {
 
 typedef enum {
 	DND_DRAG_TYPE_CONTACT_ID,
+	DND_DRAG_TYPE_INDIVIDUAL_ID,
 	DND_DRAG_TYPE_URI_LIST,
 	DND_DRAG_TYPE_TAB
 } DndDragType;
 
 static const GtkTargetEntry drag_types_dest[] = {
 	{ "text/contact-id", 0, DND_DRAG_TYPE_CONTACT_ID },
+	{ "text/x-individual-id", 0, DND_DRAG_TYPE_INDIVIDUAL_ID },
 	{ "GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, DND_DRAG_TYPE_TAB },
 	{ "text/uri-list", 0, DND_DRAG_TYPE_URI_LIST },
 	{ "text/path-list", 0, DND_DRAG_TYPE_URI_LIST },
@@ -142,6 +145,7 @@ static const GtkTargetEntry drag_types_dest[] = {
 
 static const GtkTargetEntry drag_types_dest_contact[] = {
 	{ "text/contact-id", 0, DND_DRAG_TYPE_CONTACT_ID },
+	{ "text/x-individual-id", 0, DND_DRAG_TYPE_INDIVIDUAL_ID },
 };
 
 static const GtkTargetEntry drag_types_dest_file[] = {
@@ -213,13 +217,168 @@ chat_window_find_chat (EmpathyChat *chat)
 }
 
 static void
+remove_all_chats (EmpathyChatWindow *window)
+{
+	EmpathyChatWindowPriv *priv;
+
+	priv = GET_PRIV (window);
+	g_object_ref (window);
+
+	while (priv->chats) {
+		empathy_chat_window_remove_chat (window, priv->chats->data);
+	}
+
+	g_object_unref (window);
+}
+
+static void
+confirm_close_response_cb (GtkWidget *dialog,
+                           int response,
+                           EmpathyChatWindow *window)
+{
+	EmpathyChat *chat;
+
+	chat = g_object_get_data (G_OBJECT (dialog), "chat");
+
+	gtk_widget_destroy (dialog);
+
+	if (response != GTK_RESPONSE_ACCEPT)
+		return;
+
+	if (chat != NULL) {
+		empathy_chat_window_remove_chat (window, chat);
+	} else {
+		remove_all_chats (window);
+	}
+}
+
+static void
+confirm_close (EmpathyChatWindow *window,
+               gboolean close_window,
+               guint n_rooms,
+               EmpathyChat *chat)
+{
+	EmpathyChatWindowPriv *priv;
+	GtkWidget *dialog;
+	gchar *primary, *secondary;
+
+	g_return_if_fail (n_rooms > 0);
+
+	if (n_rooms > 1) {
+		g_return_if_fail (chat == NULL);
+	} else {
+		g_return_if_fail (chat != NULL);
+	}
+
+	priv = GET_PRIV (window);
+
+	/* If there are no chats in this window, how could we possibly have got
+	 * here?
+	 */
+	g_return_if_fail (priv->chats != NULL);
+
+	/* Treat closing a window which only has one tab exactly like closing
+	 * that tab.
+	 */
+	if (close_window && priv->chats->next == NULL) {
+		close_window = FALSE;
+		chat = priv->chats->data;
+	}
+
+	if (close_window) {
+		primary = g_strdup (_("Close this window?"));
+
+		if (n_rooms == 1) {
+			gchar *chat_name = empathy_chat_dup_name (chat);
+			secondary = g_strdup_printf (
+				_("Closing this window will leave %s. You will "
+				  "not receive any further messages until you "
+				  "rejoin it."),
+				chat_name);
+			g_free (chat_name);
+		} else {
+			secondary = g_strdup_printf (
+				/* Note to translators: the number of chats will
+				 * always be at least 2.
+				 */
+				ngettext (
+					"Closing this window will leave a chat room. You will "
+					"not receive any further messages until you rejoin it.",
+					"Closing this window will leave %u chat rooms. You will "
+					"not receive any further messages until you rejoin them.",
+					n_rooms),
+				n_rooms);
+		}
+	} else {
+		gchar *chat_name = empathy_chat_dup_name (chat);
+		primary = g_strdup_printf (_("Leave %s?"), chat_name);
+		secondary = g_strdup (_("You will not receive any further messages from this chat "
+		                        "room until you rejoin it."));
+		g_free (chat_name);
+	}
+
+	dialog = gtk_message_dialog_new (
+		GTK_WINDOW (priv->dialog),
+		GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+		GTK_MESSAGE_WARNING,
+		GTK_BUTTONS_CANCEL,
+		"%s", primary);
+
+	gtk_window_set_title (GTK_WINDOW (dialog), "");
+	g_object_set (dialog, "secondary-text", secondary, NULL);
+
+	g_free (primary);
+	g_free (secondary);
+
+	gtk_dialog_add_button (GTK_DIALOG (dialog),
+		close_window ? _("Close window") : _("Leave room"),
+		GTK_RESPONSE_ACCEPT);
+	gtk_dialog_set_default_response (GTK_DIALOG (dialog),
+		GTK_RESPONSE_ACCEPT);
+
+	if (!close_window) {
+		g_object_set_data (G_OBJECT (dialog), "chat", chat);
+	}
+
+	g_signal_connect (dialog, "response",
+		G_CALLBACK (confirm_close_response_cb), window);
+
+	gtk_window_present (GTK_WINDOW (dialog));
+}
+
+/* Returns TRUE if we should check if the user really wants to leave.  If it's
+ * a multi-user chat, and it has a TpChat (so there's an underlying channel, so
+ * the user is actually in the room as opposed to having been kicked or gone
+ * offline or something), then we should check.
+ */
+static gboolean
+chat_needs_close_confirmation (EmpathyChat *chat)
+{
+	return (empathy_chat_is_room (chat)
+		&& empathy_chat_get_tp_chat (chat) != NULL);
+}
+
+static void
+maybe_close_chat (EmpathyChatWindow *window,
+                  EmpathyChat *chat)
+{
+	g_return_if_fail (chat != NULL);
+
+	if (chat_needs_close_confirmation (chat)) {
+		confirm_close (window, FALSE, 1, chat);
+	} else {
+		empathy_chat_window_remove_chat (window, chat);
+	}
+}
+
+static void
 chat_window_close_clicked_cb (GtkAction   *action,
 			      EmpathyChat *chat)
 {
 	EmpathyChatWindow *window;
 
 	window = chat_window_find_chat (chat);
-	empathy_chat_window_remove_chat (window, chat);
+	maybe_close_chat (window, chat);
 }
 
 static void
@@ -765,6 +924,19 @@ chat_window_update_chat_tab_full (EmpathyChat *chat,
 		append_markup_printf (tooltip, "\n%s", _("Typing a message."));
 	}
 
+	if (remote_contact != NULL) {
+		const gchar * const *types;
+
+		types = empathy_contact_get_client_types (remote_contact);
+		if (types != NULL && !tp_strdiff (types[0], "phone")) {
+			/* I'm on a phone ! */
+			gchar *tmp = name;
+
+			name = g_strdup_printf ("☎ %s", name);
+			g_free (tmp);
+		}
+	}
+
 	markup = g_string_free (tooltip, FALSE);
 	widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-tooltip-widget");
 	gtk_widget_set_tooltip_markup (widget, markup);
@@ -773,10 +945,19 @@ chat_window_update_chat_tab_full (EmpathyChat *chat,
 	g_free (markup);
 
 	/* Update tab and menu label */
+	if (empathy_chat_is_highlighted (chat)) {
+		markup = g_markup_printf_escaped (
+			"<span color=\"red\" weight=\"bold\">%s</span>",
+			name);
+	} else {
+		markup = g_markup_escape_text (name, -1);
+	}
+
 	widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
-	gtk_label_set_text (GTK_LABEL (widget), name);
+	gtk_label_set_markup (GTK_LABEL (widget), markup);
 	widget = g_object_get_data (G_OBJECT (chat), "chat-window-menu-label");
-	gtk_label_set_text (GTK_LABEL (widget), name);
+	gtk_label_set_markup (GTK_LABEL (widget), markup);
+	g_free (markup);
 
 	/* Update the window if it's the current chat */
 	if (priv->current_chat == chat) {
@@ -1027,7 +1208,7 @@ chat_window_close_activate_cb (GtkAction         *action,
 
 	g_return_if_fail (priv->current_chat != NULL);
 
-	empathy_chat_window_remove_chat (window, priv->current_chat);
+	maybe_close_chat (window, priv->current_chat);
 }
 
 static void
@@ -1271,14 +1452,25 @@ chat_window_delete_event_cb (GtkWidget        *dialog,
 			     EmpathyChatWindow *window)
 {
 	EmpathyChatWindowPriv *priv = GET_PRIV (window);
+	EmpathyChat *chat = NULL;
+	guint n_rooms = 0;
+	GList *l;
 
 	DEBUG ("Delete event received");
 
-	g_object_ref (window);
-	while (priv->chats) {
-		empathy_chat_window_remove_chat (window, priv->chats->data);
+	for (l = priv->chats; l != NULL; l = l->next) {
+		if (chat_needs_close_confirmation (l->data)) {
+			chat = l->data;
+			n_rooms++;
+		}
+	}
+
+	if (n_rooms > 0) {
+		confirm_close (window, TRUE, n_rooms,
+			(n_rooms == 1 ? chat : NULL));
+	} else {
+		remove_all_chats (window);
 	}
-	g_object_unref (window);
 
 	return TRUE;
 }
@@ -1394,30 +1586,6 @@ chat_window_show_or_update_notification (EmpathyChatWindow *window,
 	g_free (escaped);
 }
 
-static void
-chat_window_set_highlight_room_labels (EmpathyChat *chat)
-{
-	gchar *markup, *name;
-	GtkWidget *widget;
-
-	if (!empathy_chat_is_room (chat))
-		return;
-
-	name = empathy_chat_dup_name (chat);
-	markup = g_markup_printf_escaped (
-		"<span color=\"red\" weight=\"bold\">%s</span>",
-		name);
-
-	widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
-	gtk_label_set_markup (GTK_LABEL (widget), markup);
-
-	widget = g_object_get_data (G_OBJECT (chat), "chat-window-menu-label");
-	gtk_label_set_markup (GTK_LABEL (widget), markup);
-
-	g_free (name);
-	g_free (markup);
-}
-
 static gboolean
 empathy_chat_window_has_focus (EmpathyChatWindow *window)
 {
@@ -1437,6 +1605,7 @@ static void
 chat_window_new_message_cb (EmpathyChat       *chat,
 			    EmpathyMessage    *message,
 			    gboolean pending,
+			    gboolean should_highlight,
 			    EmpathyChatWindow *window)
 {
 	EmpathyChatWindowPriv *priv;
@@ -1496,15 +1665,13 @@ chat_window_new_message_cb (EmpathyChat       *chat,
 		if (chatroom != NULL && empathy_chatroom_is_always_urgent (chatroom)) {
 			needs_urgency = TRUE;
 		} else {
-			needs_urgency = empathy_message_should_highlight (message);
+			needs_urgency = should_highlight;
 		}
 	} else {
 		needs_urgency = TRUE;
 	}
 
 	if (needs_urgency) {
-		chat_window_set_highlight_room_labels (chat);
-
 		if (!has_focus) {
 			chat_window_set_urgency_hint (window, TRUE);
 		}
@@ -1818,6 +1985,70 @@ chat_window_drag_motion (GtkWidget        *widget,
 }
 
 static void
+drag_data_received_individual_id (EmpathyChatWindow *self,
+				  GtkWidget *widget,
+				  GdkDragContext *context,
+				  int x,
+				  int y,
+				  GtkSelectionData *selection,
+				  guint info,
+				  guint time_)
+{
+	const gchar *id;
+	EmpathyIndividualManager *manager;
+	FolksIndividual *individual;
+	EmpathyChatWindowPriv *priv = GET_PRIV (self);
+	EmpathyTpChat *chat;
+	TpContact *tp_contact;
+	TpConnection *conn;
+	EmpathyContact *contact;
+
+	id = (const gchar *) gtk_selection_data_get_data (selection);
+
+	DEBUG ("DND invididual %s", id);
+
+	if (priv->current_chat == NULL)
+		goto out;
+
+	chat = empathy_chat_get_tp_chat (priv->current_chat);
+	if (chat == NULL)
+		goto out;
+
+	if (!empathy_tp_chat_can_add_contact (chat)) {
+		DEBUG ("Can't invite contact to %s",
+				tp_proxy_get_object_path (chat));
+		goto out;
+	}
+
+	manager = empathy_individual_manager_dup_singleton ();
+
+	individual = empathy_individual_manager_lookup_member (manager, id);
+	if (individual == NULL) {
+		DEBUG ("Failed to find individual %s", id);
+		goto out;
+	}
+
+	conn = tp_channel_borrow_connection ((TpChannel *) chat);
+	tp_contact = empathy_get_tp_contact_for_individual (individual, conn);
+	if (tp_contact == NULL) {
+		DEBUG ("Can't find a TpContact on connection %s for %s",
+				tp_proxy_get_object_path (conn), id);
+		goto out;
+	}
+
+	DEBUG ("Inviting %s to join %s", tp_contact_get_identifier (tp_contact),
+			tp_channel_get_identifier ((TpChannel *) chat));
+
+	contact = empathy_contact_dup_from_tp_contact (tp_contact);
+	empathy_contact_list_add (EMPATHY_CONTACT_LIST (chat), contact, NULL);
+	g_object_unref (contact);
+
+out:
+	gtk_drag_finish (context, TRUE, FALSE, time_);
+	tp_clear_object (&manager);
+}
+
+static void
 chat_window_drag_data_received (GtkWidget        *widget,
 				GdkDragContext   *context,
 				int               x,
@@ -1897,6 +2128,10 @@ chat_window_drag_data_received (GtkWidget        *widget,
 		 */
 		gtk_drag_finish (context, TRUE, FALSE, time_);
 	}
+	else if (info == DND_DRAG_TYPE_INDIVIDUAL_ID) {
+		drag_data_received_individual_id (window, widget, context, x, y,
+				selection, info, time_);
+	}
 	else if (info == DND_DRAG_TYPE_URI_LIST) {
 		EmpathyChatWindowPriv *priv;
 		EmpathyContact *contact;
diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index 25749861c..bf95bff16 100644
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -205,8 +205,8 @@
   <object class="GtkWindow" id="chat_window">
     <property name="title" translatable="yes">Chat</property>
     <property name="role">chat</property>
-    <property name="default_width">350</property>
-    <property name="default_height">250</property>
+    <property name="default_width">580</property>
+    <property name="default_height">480</property>
     <child>
       <object class="GtkVBox" id="chat_vbox">
         <property name="visible">True</property>
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 43ab00270..bebca4382 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -31,6 +31,7 @@
 #include <telepathy-glib/debug-sender.h>
 
 #include <libempathy/empathy-presence-manager.h>
+#include <libempathy/empathy-individual-manager.h>
 
 #include <libempathy-gtk/empathy-theme-manager.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
@@ -100,6 +101,7 @@ main (int argc,
   EmpathyPresenceManager *presence_mgr;
   EmpathyThemeManager *theme_mgr;
   gint retval;
+  EmpathyIndividualManager *individual_mgr;
 
   /* Init */
   g_thread_init (NULL);
@@ -143,6 +145,10 @@ main (int argc,
   /* Keep the theme manager alive as it does some caching */
   theme_mgr = empathy_theme_manager_dup_singleton ();
 
+  /* Keep the individual manager alive so we won't fetch everything from Folks
+   * each time we need to use it. */
+  individual_mgr = empathy_individual_manager_dup_singleton ();
+
   if (g_getenv ("EMPATHY_PERSIST") != NULL)
     {
       DEBUG ("Disable timer");
@@ -163,6 +169,7 @@ main (int argc,
   g_object_unref (presence_mgr);
   g_object_unref (theme_mgr);
   tp_clear_object (&chat_mgr);
+  g_object_unref (individual_mgr);
 
 #ifdef ENABLE_DEBUG
   g_object_unref (debug_sender);
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index b298600a9..3aa8c1502 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -69,6 +69,9 @@ enum
   COL_NAME = 0,
   COL_UNIQUE_NAME,
   COL_GONE,
+  COL_ACTIVE_BUFFER,
+  COL_PAUSE_BUFFER,
+  COL_PROXY,
   NUM_COLS
 };
 
@@ -91,11 +94,7 @@ typedef struct
   GtkToolItem *level_label;
   GtkWidget *level_filter;
 
-  /* Cache */
-  GHashTable *cache;
-
   /* TreeView */
-  GtkListStore *store;
   GtkTreeModel *store_filter;
   GtkWidget *view;
   GtkWidget *scrolled_win;
@@ -104,10 +103,7 @@ typedef struct
 
   /* Connection */
   TpDBusDaemon *dbus;
-  TpProxy *proxy;
-  TpProxySignalConnection *new_debug_message_signal;
   TpProxySignalConnection *name_owner_changed_signal;
-  gulong invalid_signal_id;
 
   /* Whether NewDebugMessage will be fired */
   gboolean paused;
@@ -115,12 +111,17 @@ typedef struct
   /* Service (CM, Client) chooser store */
   GtkListStore *service_store;
 
+  /* Counters on services detected and added */
+  guint services_detected;
+  guint name_owner_cb_count;
+
   /* Debug to show upon creation */
   gchar *select_name;
 
   /* Misc. */
   gboolean dispose_run;
   TpAccountManager *am;
+  GtkListStore *all_active_buffer;
 } EmpathyDebugWindowPriv;
 
 static const gchar *
@@ -152,48 +153,6 @@ log_level_to_string (guint level)
     }
 }
 
-typedef struct
-{
-  gdouble timestamp;
-  gchar *domain;
-  guint level;
-  gchar *message;
-} DebugMessage;
-
-static DebugMessage *
-debug_message_new (gdouble timestamp,
-    const gchar *domain,
-    guint level,
-    const gchar *message)
-{
-  DebugMessage *retval = g_slice_new0 (DebugMessage);
-
-  retval->timestamp = timestamp;
-  retval->domain = g_strdup (domain);
-  retval->level = level;
-  retval->message = g_strdup (message);
-
-  return retval;
-}
-
-static void
-debug_message_free (DebugMessage *dm)
-{
-  g_free (dm->domain);
-  g_free (dm->message);
-
-  g_slice_free (DebugMessage, dm);
-}
-
-static void
-debug_message_list_free (gpointer data)
-{
-  GList *list = data;
-
-  g_list_foreach (list, (GFunc) debug_message_free, NULL);
-  g_list_free (list);
-}
-
 static gchar *
 get_active_service_name (EmpathyDebugWindow *self)
 {
@@ -210,30 +169,66 @@ get_active_service_name (EmpathyDebugWindow *self)
   return name;
 }
 
-static void
-debug_window_cache_new_message (EmpathyDebugWindow *debug_window,
-    gdouble timestamp,
-    const gchar *domain,
-    guint level,
-    const gchar *message)
+static gboolean
+copy_buffered_messages (GtkTreeModel *buffer,
+    GtkTreePath *path,
+    GtkTreeIter *iter,
+    gpointer data)
 {
-  EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
-  GList *messages;
-  DebugMessage *dm;
-  char *name;
+  GtkListStore *active_buffer = data;
+  GtkTreeIter active_buffer_iter;
+  gdouble timestamp;
+  gchar *domain, *category, *message, *level_string;
+  guint level;
 
-  name = get_active_service_name (debug_window);
-  messages = g_hash_table_lookup (priv->cache, name);
+  gtk_tree_model_get (buffer, iter,
+      COL_DEBUG_TIMESTAMP, &timestamp,
+      COL_DEBUG_DOMAIN, &domain,
+      COL_DEBUG_CATEGORY, &category,
+      COL_DEBUG_LEVEL_STRING, &level_string,
+      COL_DEBUG_MESSAGE, &message,
+      COL_DEBUG_LEVEL_VALUE, &level,
+      -1);
+  gtk_list_store_insert_with_values (active_buffer, &active_buffer_iter, -1,
+      COL_DEBUG_TIMESTAMP, timestamp,
+      COL_DEBUG_DOMAIN, domain,
+      COL_DEBUG_CATEGORY, category,
+      COL_DEBUG_LEVEL_STRING, level_string,
+      COL_DEBUG_MESSAGE, message,
+      COL_DEBUG_LEVEL_VALUE, level,
+      -1);
+
+  g_free (domain);
+  g_free (category);
+  g_free (level_string);
+  g_free (message);
 
-  dm = debug_message_new (timestamp, domain, level, message);
-  messages = g_list_append (messages, dm);
+  return FALSE;
+}
 
-  g_hash_table_insert (priv->cache, name, messages);
+static void
+insert_values_in_buffer (GtkListStore *store,
+        gdouble timestamp,
+        const gchar *domain,
+        const gchar *category,
+        guint level,
+        const gchar *string)
+{
+  GtkTreeIter iter;
+
+  gtk_list_store_insert_with_values (store, &iter, -1,
+      COL_DEBUG_TIMESTAMP, timestamp,
+      COL_DEBUG_DOMAIN, domain,
+      COL_DEBUG_CATEGORY, category,
+      COL_DEBUG_LEVEL_STRING, log_level_to_string (level),
+      COL_DEBUG_MESSAGE, string,
+      COL_DEBUG_LEVEL_VALUE, level,
+      -1); 
 }
 
 static void
 debug_window_add_message (EmpathyDebugWindow *debug_window,
-    gboolean should_cache,
+    TpProxy *proxy,
     gdouble timestamp,
     const gchar *domain_category,
     guint level,
@@ -241,12 +236,8 @@ debug_window_add_message (EmpathyDebugWindow *debug_window,
 {
   EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
   gchar *domain, *category;
-  GtkTreeIter iter;
   gchar *string;
-
-  if (should_cache)
-    debug_window_cache_new_message (debug_window, timestamp, domain_category,
-        level, message);
+  GtkListStore *active_buffer, *pause_buffer;
 
   if (g_strrstr (domain_category, "/"))
     {
@@ -266,16 +257,26 @@ debug_window_add_message (EmpathyDebugWindow *debug_window,
   else
     string = g_strdup (message);
 
+  pause_buffer = g_object_get_data (G_OBJECT (proxy), "pause-buffer");
+  active_buffer = g_object_get_data (G_OBJECT (proxy), "active-buffer");
 
-  gtk_list_store_append (priv->store, &iter);
-  gtk_list_store_set (priv->store, &iter,
-      COL_DEBUG_TIMESTAMP, timestamp,
-      COL_DEBUG_DOMAIN, domain,
-      COL_DEBUG_CATEGORY, category,
-      COL_DEBUG_LEVEL_STRING, log_level_to_string (level),
-      COL_DEBUG_MESSAGE, string,
-      COL_DEBUG_LEVEL_VALUE, level,
-      -1);
+  if (priv->paused)
+    {
+      insert_values_in_buffer (pause_buffer, timestamp,
+          domain, category, level,
+          string);
+    }
+  else
+    {
+      /* Append 'this' message to this service's and All's active-buffers */
+      insert_values_in_buffer (active_buffer, timestamp,
+          domain, category, level,
+          string);
+
+      insert_values_in_buffer (priv->all_active_buffer, timestamp,
+          domain, category, level,
+          string);
+    }
 
   g_free (string);
   g_free (domain);
@@ -293,20 +294,21 @@ debug_window_new_debug_message_cb (TpProxy *proxy,
 {
   EmpathyDebugWindow *debug_window = (EmpathyDebugWindow *) user_data;
 
-  debug_window_add_message (debug_window, TRUE, timestamp, domain, level,
+  debug_window_add_message (debug_window, proxy, timestamp, domain, level,
       message);
 }
 
 static void
-debug_window_set_enabled (EmpathyDebugWindow *debug_window,
+debug_window_set_enabled (TpProxy *proxy,
     gboolean enabled)
 {
-  EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
   GValue *val;
 
+  g_return_if_fail (proxy != NULL);
+
   val = tp_g_value_slice_new_boolean (enabled);
 
-  tp_cli_dbus_properties_call_set (priv->proxy, -1, TP_IFACE_DEBUG,
+  tp_cli_dbus_properties_call_set (proxy, -1, TP_IFACE_DEBUG,
       "Enabled", val, NULL, NULL, NULL, NULL);
 
   tp_g_value_slice_free (val);
@@ -344,6 +346,74 @@ debug_window_set_toolbar_sensitivity (EmpathyDebugWindow *debug_window,
     }
 }
 
+static gboolean
+debug_window_get_iter_for_active_buffer (GtkListStore *active_buffer,
+    GtkTreeIter *iter,
+    EmpathyDebugWindow *debug_window)
+{
+  EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
+  gboolean valid_iter;
+  GtkTreeModel *model = GTK_TREE_MODEL (priv->service_store);
+
+  gtk_tree_model_get_iter_first (model, iter);
+  for (valid_iter = gtk_tree_model_iter_next (model, iter);
+       valid_iter;
+       valid_iter = gtk_tree_model_iter_next (model, iter))
+    {
+      GtkListStore *stored_active_buffer;
+
+      gtk_tree_model_get (model, iter,
+          COL_ACTIVE_BUFFER, &stored_active_buffer,
+          -1);
+      if (active_buffer == stored_active_buffer)
+        {
+          g_object_unref (stored_active_buffer);
+          return valid_iter;
+        }
+      g_object_unref (stored_active_buffer);
+    }
+
+  return valid_iter;
+}
+
+static void refresh_all_buffer (EmpathyDebugWindow *debug_window);
+
+static void
+proxy_invalidated_cb (TpProxy *proxy,
+    guint domain,
+    gint code,
+    gchar *msg,
+    gpointer user_data)
+{
+  EmpathyDebugWindow *self = (EmpathyDebugWindow *) user_data;
+  EmpathyDebugWindowPriv *priv = GET_PRIV (self);
+  GtkTreeModel *service_store = GTK_TREE_MODEL (priv->service_store);
+  TpProxy *stored_proxy;
+  GtkTreeIter iter;
+  gboolean valid_iter;
+
+  /* Proxy has been invalidated so we find and set it to NULL
+   * in service store */
+  gtk_tree_model_get_iter_first (service_store, &iter);
+  for (valid_iter = gtk_tree_model_iter_next (service_store, &iter);
+       valid_iter;
+       valid_iter = gtk_tree_model_iter_next (service_store, &iter))
+    {
+      gtk_tree_model_get (service_store, &iter,
+          COL_PROXY, &stored_proxy,
+          -1);
+
+      if (proxy == stored_proxy)
+        gtk_list_store_set (priv->service_store, &iter,
+            COL_PROXY, NULL,
+            -1);
+    }
+
+  /* Also, we refresh "All" selection's active buffer since it should not
+   * show messages obtained from the proxy getting destroyed above */
+  refresh_all_buffer (self);
+}
+
 static void
 debug_window_get_messages_cb (TpProxy *proxy,
     const GPtrArray *messages,
@@ -353,87 +423,301 @@ debug_window_get_messages_cb (TpProxy *proxy,
 {
   EmpathyDebugWindow *debug_window = (EmpathyDebugWindow *) user_data;
   EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
-  gchar *name;
-  GList *old_messages;
+  gchar *active_service_name;
   guint i;
+  GtkListStore *active_buffer;
+  gboolean valid_iter;
+  GtkTreeIter iter;
+  gchar *proxy_service_name;
 
+  active_buffer = g_object_get_data (G_OBJECT (proxy), "active-buffer");
+  valid_iter = debug_window_get_iter_for_active_buffer (active_buffer, &iter,
+      debug_window);
+  gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), &iter,
+      COL_NAME, &proxy_service_name,
+      -1);
+
+  active_service_name = get_active_service_name (debug_window);
   if (error != NULL)
     {
       DEBUG ("GetMessages failed: %s", error->message);
-      debug_window_set_toolbar_sensitivity (debug_window, FALSE);
+
+      /* We want to set the window sensitivity to false only when proxy for the
+       * selected service is unable to fetch debug messages */
+      if (!tp_strdiff (active_service_name, proxy_service_name))
+        debug_window_set_toolbar_sensitivity (debug_window, FALSE);
+
+      /* We created the proxy for GetMessages call. Now destroy it. */
+      tp_clear_object (&proxy);
       return;
     }
 
+  DEBUG ("Retrieved debug messages for %s", active_service_name);
+  g_free (active_service_name);
   debug_window_set_toolbar_sensitivity (debug_window, TRUE);
 
-  name = get_active_service_name (debug_window);
-  old_messages = g_hash_table_lookup (priv->cache, name);
-
-  /* we call get_messages either when a new CM is added or
-   * when a CM that we've already seen re-appears; in both cases
-   * we don't need our old cache anymore.
-   */
-  if (old_messages != NULL)
-    {
-      g_hash_table_remove (priv->cache, name);
-      debug_message_list_free (old_messages);
-    }
 
   for (i = 0; i < messages->len; i++)
     {
       GValueArray *values = g_ptr_array_index (messages, i);
 
-      debug_window_add_message (debug_window, TRUE,
+      debug_window_add_message (debug_window, proxy,
           g_value_get_double (g_value_array_get_nth (values, 0)),
           g_value_get_string (g_value_array_get_nth (values, 1)),
           g_value_get_uint (g_value_array_get_nth (values, 2)),
           g_value_get_string (g_value_array_get_nth (values, 3)));
     }
 
-  /* Connect to NewDebugMessage */
-  priv->new_debug_message_signal = emp_cli_debug_connect_to_new_debug_message (
+  /* Now we save this precious proxy in the service_store along its service */
+  if (valid_iter)
+    {
+      DEBUG ("Proxy for service: %s was successful in fetching debug"
+          " messages. Saving it.", proxy_service_name);
+
+      gtk_list_store_set (priv->service_store, &iter,
+          COL_PROXY, proxy,
+          -1);
+    }
+
+  g_free (proxy_service_name);
+
+  /* Connect to "invalidated" signal */
+  g_signal_connect (proxy, "invalidated",
+      G_CALLBACK (proxy_invalidated_cb), debug_window);
+
+ /* Connect to NewDebugMessage */
+  emp_cli_debug_connect_to_new_debug_message (
       proxy, debug_window_new_debug_message_cb, debug_window,
       NULL, NULL, NULL);
 
-  /* Set Enabled as appropriate */
-  debug_window_set_enabled (debug_window, !priv->paused);
+  /* Now that active-buffer is up to date, we can see which messages are
+   * to be visible */
+  gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->store_filter));
+
+  /* Set the proxy to signal for new debug messages */
+  debug_window_set_enabled (proxy, TRUE);
 }
 
 static void
-debug_window_add_log_messages_from_cache (EmpathyDebugWindow *debug_window,
-    const gchar *name)
+create_proxy_to_get_messages (EmpathyDebugWindow *debug_window,
+    GtkTreeIter *iter,
+    TpDBusDaemon *dbus)
 {
-  GList *messages, *l;
-  DebugMessage *dm;
   EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
+  gchar *bus_name, *name = NULL;
+  TpProxy *new_proxy, *stored_proxy = NULL;
+  GtkTreeModel *pause_buffer, *active_buffer;
+  gboolean gone;
 
-  DEBUG ("Adding logs from cache for CM %s", name);
+  gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), iter,
+      COL_NAME, &name,
+      COL_GONE, &gone,
+      COL_ACTIVE_BUFFER, &active_buffer,
+      COL_PAUSE_BUFFER, &pause_buffer,
+      COL_PROXY, &stored_proxy,
+      -1);
 
-  messages = g_hash_table_lookup (priv->cache, name);
+  /* If the stored_proxy is not NULL then messages have been obtained and
+   * new-debug-message-signal has been set on it. Also, the proxy is valid.
+   * If the service is gone, we still display the messages-cached till now. */
+  if (gone ||
+      (!gone && stored_proxy != NULL))
+    {
+      /* Nothing needs to be done. The associated active-buffer has already
+       * been set as view's model */
+      goto finally;
+    }
 
-  if (messages == NULL)
-    return;
+  DEBUG ("Preparing proxy to obtain messages for service %s", name);
 
-  for (l = messages; l != NULL; l = l->next)
-    {
-      dm = l->data;
+  gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), iter,
+      COL_UNIQUE_NAME, &bus_name, -1);
+  new_proxy = g_object_new (TP_TYPE_PROXY,
+      "bus-name", bus_name,
+      "dbus-daemon", dbus,
+      "object-path", DEBUG_OBJECT_PATH,
+      NULL);
+  g_free (bus_name);
+
+  g_object_set_data (G_OBJECT (new_proxy), "active-buffer", active_buffer);
+  g_object_set_data (G_OBJECT (new_proxy), "pause-buffer", pause_buffer);
+
+  /* Now we call GetMessages with fresh proxy.
+   * The old proxy is NULL due to one of the following -
+   * * Wasn't saved as last GetMessages call failed
+   * * The service has newly arrived and no proxy has been prepared yet for it
+   * * A service with the same name has reappeared but the owner maybe new */
+  tp_proxy_add_interface_by_id (new_proxy, emp_iface_quark_debug ());
+
+  emp_cli_debug_call_get_messages (new_proxy, -1,
+      debug_window_get_messages_cb, debug_window, NULL, NULL);
+
+finally:
+  g_free (name);
+  tp_clear_object (&stored_proxy);
+  g_object_unref (active_buffer);
+  g_object_unref (pause_buffer);
+}
+
+static GtkListStore*
+new_list_store_for_service (void)
+{
+  return gtk_list_store_new (NUM_DEBUG_COLS,
+             G_TYPE_DOUBLE, /* COL_DEBUG_TIMESTAMP */
+             G_TYPE_STRING, /* COL_DEBUG_DOMAIN */
+             G_TYPE_STRING, /* COL_DEBUG_CATEGORY */
+             G_TYPE_STRING, /* COL_DEBUG_LEVEL_STRING */
+             G_TYPE_STRING, /* COL_DEBUG_MESSAGE */
+             G_TYPE_UINT);  /* COL_DEBUG_LEVEL_VALUE */
+}
+
+static gboolean
+debug_window_visible_func (GtkTreeModel *model,
+    GtkTreeIter *iter,
+    gpointer user_data)
+{
+  EmpathyDebugWindow *debug_window = (EmpathyDebugWindow *) user_data;
+  EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
+  guint filter_value, level;
+  GtkTreeModel *filter_model;
+  GtkTreeIter filter_iter;
+
+  filter_model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->level_filter));
+  gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->level_filter),
+      &filter_iter);
+
+  gtk_tree_model_get (model, iter, COL_DEBUG_LEVEL_VALUE, &level, -1);
+  gtk_tree_model_get (filter_model, &filter_iter,
+      COL_LEVEL_VALUE, &filter_value, -1);
+
+  if (level <= filter_value)
+    return TRUE;
+
+  return FALSE;
+}
+
+static gboolean
+tree_view_search_equal_func_cb (GtkTreeModel *model,
+    gint column,
+    const gchar *key,
+
+    GtkTreeIter *iter,
+    gpointer search_data)
+{
+  gchar *str;
+  gint key_len;
+  gint len;
+  gint i;
+  gboolean ret = TRUE; /* The return value is counter-intuitive */
+
+  gtk_tree_model_get (model, iter, column, &str, -1);
 
-      debug_window_add_message (debug_window, FALSE, dm->timestamp,
-          dm->domain, dm->level, dm->message);
+  key_len = strlen (key);
+  len = strlen (str) - key_len;
+
+  for (i = 0; i <= len; ++i)
+    {
+      if (!g_ascii_strncasecmp (key, str + i, key_len))
+        {
+          ret = FALSE;
+          break;
+        }
     }
+
+  g_free (str);
+  return ret;
 }
 
 static void
-proxy_invalidated_cb (TpProxy *proxy,
-    guint domain,
-    gint code,
-    gchar *msg,
-    EmpathyDebugWindowPriv *self)
+update_store_filter (EmpathyDebugWindow *debug_window,
+    GtkListStore *active_buffer)
 {
-  EmpathyDebugWindowPriv *priv = GET_PRIV (self);
+  EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
+  debug_window_set_toolbar_sensitivity (debug_window, FALSE);
 
-  /* Proxy has been invalidated so we can't disconnect the signal any more */
-  priv->new_debug_message_signal = NULL;
+  tp_clear_object (&priv->store_filter);
+  priv->store_filter = gtk_tree_model_filter_new (
+      GTK_TREE_MODEL (active_buffer), NULL);
+
+  gtk_tree_model_filter_set_visible_func (
+      GTK_TREE_MODEL_FILTER (priv->store_filter),
+      debug_window_visible_func, debug_window, NULL);
+  gtk_tree_view_set_model (GTK_TREE_VIEW (priv->view),
+      priv->store_filter);
+
+  /* Since view's model has changed, reset the search column and
+   * search_equal_func */
+  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->view),
+      COL_DEBUG_MESSAGE);
+  gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (priv->view),
+      tree_view_search_equal_func_cb, NULL, NULL);
+
+  debug_window_set_toolbar_sensitivity (debug_window, TRUE);
+}
+
+static void
+refresh_all_buffer (EmpathyDebugWindow *debug_window)
+{
+  EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
+  gboolean valid_iter;
+  GtkTreeIter iter;
+  GtkTreeModel *service_store = GTK_TREE_MODEL (priv->service_store);
+
+  /* Clear All's active-buffer */
+  gtk_list_store_clear (priv->all_active_buffer);
+
+  /* Skipping the first service store iter which is reserved for "All" */
+  gtk_tree_model_get_iter_first (service_store, &iter);
+  for (valid_iter = gtk_tree_model_iter_next (service_store, &iter);
+       valid_iter;
+       valid_iter = gtk_tree_model_iter_next (service_store, &iter))
+    {
+      TpProxy *proxy = NULL;
+      GtkListStore *service_active_buffer;
+      gboolean gone;
+
+      gtk_tree_model_get (service_store, &iter,
+          COL_GONE, &gone,
+          COL_PROXY, &proxy,
+          COL_ACTIVE_BUFFER, &service_active_buffer,
+          -1);
+
+      if (gone)
+        {
+          gtk_tree_model_foreach (GTK_TREE_MODEL (service_active_buffer),
+              copy_buffered_messages, priv->all_active_buffer);
+        }
+      else
+        {
+          if (proxy != NULL)
+            {
+              if (service_active_buffer == NULL)
+                break;
+
+              /* Copy the debug messages to all_active_buffer */
+              gtk_tree_model_foreach (GTK_TREE_MODEL (service_active_buffer),
+                  copy_buffered_messages, priv->all_active_buffer);
+            }
+          else
+            {
+              GError *error = NULL;
+              TpDBusDaemon *dbus = tp_dbus_daemon_dup (&error);
+
+              if (error != NULL)
+                {
+                  DEBUG ("Failed at duping the dbus daemon: %s", error->message);
+                  g_error_free (error);
+                }
+
+              create_proxy_to_get_messages (debug_window, &iter, dbus);
+
+              g_object_unref (dbus);
+            }
+        }
+
+      g_object_unref (service_active_buffer);
+      tp_clear_object (&proxy);
+    }
 }
 
 static void
@@ -443,8 +727,8 @@ debug_window_service_chooser_changed_cb (GtkComboBox *chooser,
   EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
   TpDBusDaemon *dbus;
   GError *error = NULL;
-  gchar *bus_name, *name = NULL;
-  TpProxy *proxy;
+  GtkListStore *stored_active_buffer = NULL;
+  gchar *name = NULL;
   GtkTreeIter iter;
   gboolean gone;
 
@@ -459,64 +743,44 @@ debug_window_service_chooser_changed_cb (GtkComboBox *chooser,
       return;
     }
 
-  gtk_list_store_clear (priv->store);
+  debug_window_set_toolbar_sensitivity (debug_window, TRUE);
 
   gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), &iter,
-      COL_NAME, &name, COL_GONE, &gone, -1);
+      COL_NAME, &name,
+      COL_GONE, &gone,
+      COL_ACTIVE_BUFFER, &stored_active_buffer,
+      -1);
+
+  DEBUG ("Service chosen: %s", name);
 
-  if (gone)
+  if (tp_strdiff (name, "All") && stored_active_buffer == NULL)
     {
-      debug_window_add_log_messages_from_cache (debug_window, name);
-      g_free (name);
-      return;
+      DEBUG ("No list store assigned to service %s", name);
+      goto finally;
     }
 
-  g_free (name);
-
-  dbus = tp_dbus_daemon_dup (&error);
-
-  if (error != NULL)
+  if (!tp_strdiff (name, "All"))
     {
-      DEBUG ("Failed at duping the dbus daemon: %s", error->message);
+      update_store_filter (debug_window, priv->all_active_buffer);
+      goto finally;
     }
 
-  gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), &iter,
-      COL_UNIQUE_NAME, &bus_name, -1);
-  proxy = g_object_new (TP_TYPE_PROXY,
-      "bus-name", bus_name,
-      "dbus-daemon", dbus,
-      "object-path", DEBUG_OBJECT_PATH,
-      NULL);
-  g_free (bus_name);
-
-  /* Disable debug signalling */
-  if (priv->proxy != NULL)
-    debug_window_set_enabled (debug_window, FALSE);
+  update_store_filter (debug_window, stored_active_buffer);
 
-  /* Disconnect from previous NewDebugMessage signal */
-  if (priv->new_debug_message_signal != NULL)
-    {
-      tp_proxy_signal_connection_disconnect (priv->new_debug_message_signal);
-      priv->new_debug_message_signal = NULL;
-    }
+  dbus = tp_dbus_daemon_dup (&error);
 
-  if (priv->proxy != NULL)
+  if (error != NULL)
     {
-      g_signal_handler_disconnect (priv->proxy, priv->invalid_signal_id);
-      g_object_unref (priv->proxy);
+      DEBUG ("Failed at duping the dbus daemon: %s", error->message);
     }
 
-  priv->proxy = proxy;
-
-  tp_proxy_add_interface_by_id (priv->proxy, emp_iface_quark_debug ());
-
-  emp_cli_debug_call_get_messages (priv->proxy, -1,
-      debug_window_get_messages_cb, debug_window, NULL, NULL);
-
-  priv->invalid_signal_id = g_signal_connect (proxy, "invalidated",
-      G_CALLBACK (proxy_invalidated_cb), debug_window);
+  create_proxy_to_get_messages (debug_window, &iter, dbus);
 
   g_object_unref (dbus);
+
+finally:
+  g_free (name);
+  tp_clear_object (&stored_active_buffer);
 }
 
 typedef struct
@@ -673,6 +937,9 @@ debug_window_get_name_owner_cb (TpDBusDaemon *proxy,
   FillServiceChooserData *data = (FillServiceChooserData *) user_data;
   EmpathyDebugWindow *self = EMPATHY_DEBUG_WINDOW (data->debug_window);
   EmpathyDebugWindowPriv *priv = GET_PRIV (data->debug_window);
+  GtkTreeIter iter;
+
+  priv->name_owner_cb_count++;
 
   if (error != NULL)
     {
@@ -682,8 +949,8 @@ debug_window_get_name_owner_cb (TpDBusDaemon *proxy,
 
   if (!debug_window_service_is_in_model (data->debug_window, out, NULL, FALSE))
     {
-      GtkTreeIter iter;
       char *name;
+      GtkListStore *active_buffer, *pause_buffer;
 
       DEBUG ("Adding %s to list: %s at unique name: %s",
           data->type == SERVICE_TYPE_CM? "CM": "Client",
@@ -694,12 +961,21 @@ debug_window_get_name_owner_cb (TpDBusDaemon *proxy,
       else
         name = g_strdup (data->name);
 
-      gtk_list_store_append (priv->service_store, &iter);
-      gtk_list_store_set (priv->service_store, &iter,
+      active_buffer = new_list_store_for_service ();
+      pause_buffer = new_list_store_for_service ();
+
+      gtk_list_store_insert_with_values (priv->service_store, &iter, -1,
           COL_NAME, name,
           COL_UNIQUE_NAME, out,
+          COL_GONE, FALSE,
+          COL_ACTIVE_BUFFER, active_buffer,
+          COL_PAUSE_BUFFER, pause_buffer,
+          COL_PROXY, NULL,
           -1);
 
+      g_object_unref (active_buffer);
+      g_object_unref (pause_buffer);
+
       if (priv->select_name != NULL &&
           !tp_strdiff (name, priv->select_name))
         {
@@ -710,6 +986,22 @@ debug_window_get_name_owner_cb (TpDBusDaemon *proxy,
       g_free (name);
     }
 
+    if (priv->services_detected == priv->name_owner_cb_count)
+      {
+        /* Time to add "All" selection to service_store */
+        gtk_list_store_insert_with_values (priv->service_store, &iter, 0,
+            COL_NAME, "All",
+            COL_ACTIVE_BUFFER, NULL,
+            -1);
+
+        priv->all_active_buffer = new_list_store_for_service ();
+
+        /* Populate active buffers for all services */
+        refresh_all_buffer (self);
+
+        gtk_combo_box_set_active (GTK_COMBO_BOX (priv->chooser), 0);
+      }
+
 OUT:
   fill_service_chooser_data_free (data);
 }
@@ -724,6 +1016,7 @@ debug_window_list_connection_names_cb (const gchar * const *names,
     GObject *weak_object)
 {
   EmpathyDebugWindow *debug_window = (EmpathyDebugWindow *) user_data;
+  EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
   guint i;
   TpDBusDaemon *dbus;
   GError *error2 = NULL;
@@ -751,6 +1044,8 @@ debug_window_list_connection_names_cb (const gchar * const *names,
       tp_cli_dbus_daemon_call_get_name_owner (dbus, -1,
           names[i], debug_window_get_name_owner_cb,
           data, NULL, NULL);
+
+      priv->services_detected ++;
     }
 
   g_object_unref (dbus);
@@ -786,6 +1081,7 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy,
 
   if (EMP_STR_EMPTY (arg1) && !EMP_STR_EMPTY (arg2))
     {
+      GtkTreeIter *found_at_iter = NULL;
       gchar *display_name;
 
       if (type == SERVICE_TYPE_CM)
@@ -794,41 +1090,72 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy,
         display_name = g_strdup (name);
 
       /* A service joined */
-      if (!g_hash_table_lookup (priv->cache, name))
+      if (!debug_window_service_is_in_model (user_data, display_name,
+           &found_at_iter, TRUE))
         {
           GtkTreeIter iter;
+          GtkListStore *active_buffer, *pause_buffer;
 
           DEBUG ("Adding new service '%s' at %s.", name, arg2);
 
-          gtk_list_store_append (priv->service_store, &iter);
-          gtk_list_store_set (priv->service_store, &iter,
+          active_buffer = new_list_store_for_service ();
+          pause_buffer = new_list_store_for_service ();
+
+          gtk_list_store_insert_with_values (priv->service_store, &iter, -1,
               COL_NAME, display_name,
               COL_UNIQUE_NAME, arg2,
+              COL_GONE, FALSE,
+              COL_ACTIVE_BUFFER, active_buffer,
+              COL_PAUSE_BUFFER, pause_buffer,
+              COL_PROXY, NULL,
               -1);
+
+          g_object_unref (active_buffer);
+          g_object_unref (pause_buffer);
         }
       else
         {
-          /* a service with the same name is already in the hash table,
-           * update it and set it as re-enabled in the model.
+          /* a service with the same name is already in the service_store,
+           * update it and set it as re-enabled.
            */
-          GtkTreeIter *iter = NULL;
+          GtkListStore *active_buffer, *pause_buffer;
+          TpProxy *stored_proxy;
 
-          if (debug_window_service_is_in_model (user_data, name, &iter, TRUE))
-            {
-              DEBUG ("Refreshing CM '%s' at '%s'.", name, arg2);
+          DEBUG ("Refreshing CM '%s' at '%s'.", name, arg2);
 
-              gtk_list_store_set (priv->service_store, iter,
-                  COL_NAME, display_name,
-                  COL_UNIQUE_NAME, arg2,
-                  COL_GONE, FALSE,
-                  -1);
-              gtk_tree_iter_free (iter);
+          active_buffer= new_list_store_for_service ();
+          pause_buffer = new_list_store_for_service ();
 
-              debug_window_service_chooser_changed_cb
-                (GTK_COMBO_BOX (priv->chooser), user_data);
-            }
+          gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store),
+              found_at_iter, COL_PROXY, &stored_proxy, -1);
+
+          tp_clear_object (&stored_proxy);
+
+          gtk_list_store_set (priv->service_store, found_at_iter,
+              COL_NAME, display_name,
+              COL_UNIQUE_NAME, arg2,
+              COL_GONE, FALSE,
+              COL_ACTIVE_BUFFER, active_buffer,
+              COL_PAUSE_BUFFER, pause_buffer,
+              COL_PROXY, NULL,
+              -1);
+
+          g_object_unref (active_buffer);
+          g_object_unref (pause_buffer);
+
+          gtk_tree_iter_free (found_at_iter);
+
+          debug_window_service_chooser_changed_cb
+            (GTK_COMBO_BOX (priv->chooser), user_data);
         }
 
+      /* If a new service arrives when "All" is selected, the view will
+       * not show its messages which we do not want. So we refresh All's
+       * active buffer.
+       * Similarly for when a service with an already seen service name
+       * appears. */
+      refresh_all_buffer (self);
+
       g_free (display_name);
     }
   else if (!EMP_STR_EMPTY (arg1) && EMP_STR_EMPTY (arg2))
@@ -845,6 +1172,9 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy,
               iter, COL_GONE, TRUE, -1);
           gtk_tree_iter_free (iter);
         }
+
+      /* Refresh all's active buffer */
+      refresh_all_buffer (self);
     }
 }
 
@@ -862,6 +1192,8 @@ add_client (EmpathyDebugWindow *self,
 
   tp_cli_dbus_daemon_call_get_name_owner (priv->dbus, -1,
       name, debug_window_get_name_owner_cb, data, NULL, NULL);
+
+  priv->services_detected ++;
 }
 
 static void
@@ -895,6 +1227,7 @@ debug_window_fill_service_chooser (EmpathyDebugWindow *debug_window)
   EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
   GError *error = NULL;
   GtkTreeIter iter;
+  GtkListStore *active_buffer, *pause_buffer;
 
   priv->dbus = tp_dbus_daemon_dup (&error);
 
@@ -905,18 +1238,28 @@ debug_window_fill_service_chooser (EmpathyDebugWindow *debug_window)
       return;
     }
 
+  /* Keep a count of the services detected and added */
+  priv->services_detected = 0;
+  priv->name_owner_cb_count = 0;
+
   /* Add CMs to list */
   tp_list_connection_names (priv->dbus, debug_window_list_connection_names_cb,
       debug_window, NULL, NULL);
 
   /* add Mission Control */
-  gtk_list_store_append (priv->service_store, &iter);
-  gtk_list_store_set (priv->service_store, &iter,
+  active_buffer= new_list_store_for_service ();
+  pause_buffer = new_list_store_for_service ();
+
+  gtk_list_store_insert_with_values (priv->service_store, &iter, -1,
       COL_NAME, "mission-control",
       COL_UNIQUE_NAME, "org.freedesktop.Telepathy.MissionControl5",
+      COL_GONE, FALSE,
+      COL_ACTIVE_BUFFER, active_buffer,
+      COL_PAUSE_BUFFER, pause_buffer,
+      COL_PROXY, NULL,
       -1);
-
-  gtk_combo_box_set_active (GTK_COMBO_BOX (priv->chooser), 0);
+  g_object_unref (active_buffer);
+  g_object_unref (pause_buffer);
 
   /* add clients */
   tp_dbus_daemon_list_names (priv->dbus, 2000,
@@ -932,35 +1275,41 @@ debug_window_pause_toggled_cb (GtkToggleToolButton *pause_,
     EmpathyDebugWindow *debug_window)
 {
   EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
+  GtkTreeIter iter;
+  gboolean valid_iter;
+  GtkTreeModel *model = GTK_TREE_MODEL (priv->service_store);
 
   priv->paused = gtk_toggle_tool_button_get_active (pause_);
 
-  debug_window_set_enabled (debug_window, !priv->paused);
-}
-
-static gboolean
-debug_window_visible_func (GtkTreeModel *model,
-    GtkTreeIter *iter,
-    gpointer user_data)
-{
-  EmpathyDebugWindow *debug_window = (EmpathyDebugWindow *) user_data;
-  EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
-  guint filter_value, level;
-  GtkTreeModel *filter_model;
-  GtkTreeIter filter_iter;
+  if (!priv->paused)
+    {
+      /* Pause has been released - flush all pause buffers */
+      GtkTreeModel *service_store = GTK_TREE_MODEL (priv->service_store);
+
+      /* Skipping the first iter which is reserved for "All" */
+      gtk_tree_model_get_iter_first (model, &iter);
+      for (valid_iter = gtk_tree_model_iter_next (model, &iter);
+           valid_iter;
+           valid_iter = gtk_tree_model_iter_next (model, &iter))
+        {
+          GtkListStore *pause_buffer, *active_buffer;
 
-  filter_model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->level_filter));
-  gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->level_filter),
-      &filter_iter);
+          gtk_tree_model_get (service_store, &iter,
+              COL_PAUSE_BUFFER, &pause_buffer,
+              COL_ACTIVE_BUFFER, &active_buffer,
+              -1);
 
-  gtk_tree_model_get (model, iter, COL_DEBUG_LEVEL_VALUE, &level, -1);
-  gtk_tree_model_get (filter_model, &filter_iter,
-      COL_LEVEL_VALUE, &filter_value, -1);
+          gtk_tree_model_foreach (GTK_TREE_MODEL (pause_buffer),
+              copy_buffered_messages, active_buffer);
+          gtk_tree_model_foreach (GTK_TREE_MODEL (pause_buffer),
+              copy_buffered_messages, priv->all_active_buffer);
 
-  if (level <= filter_value)
-    return TRUE;
+          gtk_list_store_clear (pause_buffer);
 
-  return FALSE;
+          g_object_unref (active_buffer);
+          g_object_unref (pause_buffer);
+        }
+    }
 }
 
 static void
@@ -978,8 +1327,16 @@ debug_window_clear_clicked_cb (GtkToolButton *clear_button,
     EmpathyDebugWindow *debug_window)
 {
   EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
+  GtkTreeIter iter;
+  GtkListStore *active_buffer;
 
-  gtk_list_store_clear (priv->store);
+  gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->chooser), &iter);
+  gtk_tree_model_get (GTK_TREE_MODEL (priv->service_store), &iter,
+      COL_ACTIVE_BUFFER, &active_buffer, -1);
+
+  gtk_list_store_clear (active_buffer);
+
+  g_object_unref (active_buffer);
 }
 
 static void
@@ -1347,37 +1704,6 @@ debug_window_key_press_event_cb (GtkWidget *widget,
   return FALSE;
 }
 
-static gboolean
-tree_view_search_equal_func_cb (GtkTreeModel *model,
-    gint column,
-    const gchar *key,
-    GtkTreeIter *iter,
-    gpointer search_data)
-{
-  gchar *str;
-  gint key_len;
-  gint len;
-  gint i;
-  gboolean ret = TRUE; /* The return value is counter-intuitive */
-
-  gtk_tree_model_get (model, iter, column, &str, -1);
-
-  key_len = strlen (key);
-  len = strlen (str) - key_len;
-
-  for (i = 0; i <= len; ++i)
-    {
-      if (!g_ascii_strncasecmp (key, str + i, key_len))
-        {
-          ret = FALSE;
-          break;
-        }
-    }
-
-  g_free (str);
-  return ret;
-}
-
 static void
 empathy_debug_window_select_name (EmpathyDebugWindow *self,
     const gchar *name)
@@ -1456,8 +1782,13 @@ am_prepared_cb (GObject *am,
 
   /* CM */
   priv->chooser = gtk_combo_box_text_new ();
-  priv->service_store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING,
-      G_TYPE_STRING, G_TYPE_BOOLEAN);
+  priv->service_store = gtk_list_store_new (NUM_COLS,
+      G_TYPE_STRING,  /* COL_NAME */
+      G_TYPE_STRING,  /* COL_UNIQUE_NAME */
+      G_TYPE_BOOLEAN, /* COL_GONE */
+      G_TYPE_OBJECT,  /* COL_ACTIVE_BUFFER */
+      G_TYPE_OBJECT,  /* COL_PAUSE_BUFFER */
+      TP_TYPE_PROXY); /* COL_PROXY */
   gtk_combo_box_set_model (GTK_COMBO_BOX (priv->chooser),
       GTK_TREE_MODEL (priv->service_store));
   gtk_widget_show (priv->chooser);
@@ -1544,38 +1875,32 @@ am_prepared_cb (GObject *am,
   gtk_combo_box_set_model (GTK_COMBO_BOX (priv->level_filter),
       GTK_TREE_MODEL (level_store));
 
-  gtk_list_store_append (level_store, &iter);
-  gtk_list_store_set (level_store, &iter,
+  gtk_list_store_insert_with_values (level_store, &iter, -1,
       COL_LEVEL_NAME, _("Debug"),
       COL_LEVEL_VALUE, TP_DEBUG_LEVEL_DEBUG,
       -1);
 
-  gtk_list_store_append (level_store, &iter);
-  gtk_list_store_set (level_store, &iter,
+  gtk_list_store_insert_with_values (level_store, &iter, -1,
       COL_LEVEL_NAME, _("Info"),
       COL_LEVEL_VALUE, TP_DEBUG_LEVEL_INFO,
       -1);
 
-  gtk_list_store_append (level_store, &iter);
-  gtk_list_store_set (level_store, &iter,
+  gtk_list_store_insert_with_values (level_store, &iter, -1,
       COL_LEVEL_NAME, _("Message"),
       COL_LEVEL_VALUE, TP_DEBUG_LEVEL_MESSAGE,
       -1);
 
-  gtk_list_store_append (level_store, &iter);
-  gtk_list_store_set (level_store, &iter,
+  gtk_list_store_insert_with_values (level_store, &iter, -1,
       COL_LEVEL_NAME, _("Warning"),
       COL_LEVEL_VALUE, TP_DEBUG_LEVEL_WARNING,
       -1);
 
-  gtk_list_store_append (level_store, &iter);
-  gtk_list_store_set (level_store, &iter,
+  gtk_list_store_insert_with_values (level_store, &iter, -1,
       COL_LEVEL_NAME, _("Critical"),
       COL_LEVEL_VALUE, TP_DEBUG_LEVEL_CRITICAL,
       -1);
 
-  gtk_list_store_append (level_store, &iter);
-  gtk_list_store_set (level_store, &iter,
+  gtk_list_store_insert_with_values (level_store, &iter, -1,
       COL_LEVEL_NAME, _("Error"),
       COL_LEVEL_VALUE, TP_DEBUG_LEVEL_ERROR,
       -1);
@@ -1609,24 +1934,10 @@ am_prepared_cb (GObject *am,
   gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->view),
       -1, _("Message"), renderer, "text", COL_DEBUG_MESSAGE, NULL);
 
-  priv->store = gtk_list_store_new (NUM_DEBUG_COLS, G_TYPE_DOUBLE,
-      G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-      G_TYPE_UINT);
-
-  priv->store_filter = gtk_tree_model_filter_new (
-      GTK_TREE_MODEL (priv->store), NULL);
-
-  gtk_tree_model_filter_set_visible_func (
-      GTK_TREE_MODEL_FILTER (priv->store_filter),
-      debug_window_visible_func, object, NULL);
+  priv->store_filter = NULL;
 
   gtk_tree_view_set_model (GTK_TREE_VIEW (priv->view), priv->store_filter);
 
-  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->view),
-      COL_DEBUG_MESSAGE);
-  gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (priv->view),
-      tree_view_search_equal_func_cb, NULL, NULL);
-
   /* Scrolled window */
   priv->scrolled_win = g_object_ref (gtk_scrolled_window_new (NULL, NULL));
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_win),
@@ -1647,6 +1958,8 @@ am_prepared_cb (GObject *am,
 
   priv->view_visible = FALSE;
 
+  priv->all_active_buffer = NULL;
+
   debug_window_set_toolbar_sensitivity (EMPATHY_DEBUG_WINDOW (object), FALSE);
   debug_window_fill_service_chooser (EMPATHY_DEBUG_WINDOW (object));
   gtk_widget_show (GTK_WIDGET (object));
@@ -1671,8 +1984,6 @@ empathy_debug_window_init (EmpathyDebugWindow *empathy_debug_window)
   empathy_debug_window->priv = priv;
 
   priv->dispose_run = FALSE;
-  priv->cache = g_hash_table_new_full (g_str_hash, g_str_equal,
-      g_free, NULL);
 }
 
 static void
@@ -1707,22 +2018,9 @@ static void
 debug_window_finalize (GObject *object)
 {
   EmpathyDebugWindowPriv *priv = GET_PRIV (object);
-  GHashTableIter iter;
-  char *key;
-  GList *values;
 
   g_free (priv->select_name);
 
-  g_hash_table_iter_init (&iter, priv->cache);
-
-  while (g_hash_table_iter_next (&iter, (gpointer *) &key,
-          (gpointer *) &values))
-    {
-      debug_message_list_free (values);
-    }
-
-  g_hash_table_unref (priv->cache);
-
   (G_OBJECT_CLASS (empathy_debug_window_parent_class)->finalize) (object);
 }
 
@@ -1737,22 +2035,9 @@ debug_window_dispose (GObject *object)
 
   priv->dispose_run = TRUE;
 
-  if (priv->store != NULL)
-    g_object_unref (priv->store);
-
   if (priv->name_owner_changed_signal != NULL)
     tp_proxy_signal_connection_disconnect (priv->name_owner_changed_signal);
 
-  if (priv->new_debug_message_signal != NULL)
-    tp_proxy_signal_connection_disconnect (priv->new_debug_message_signal);
-
-  if (priv->proxy != NULL)
-    {
-      debug_window_set_enabled (EMPATHY_DEBUG_WINDOW (object), FALSE);
-      g_signal_handler_disconnect (priv->proxy, priv->invalid_signal_id);
-      g_object_unref (priv->proxy);
-    }
-
   if (priv->service_store != NULL)
     g_object_unref (priv->service_store);
 
@@ -1765,6 +2050,8 @@ debug_window_dispose (GObject *object)
       priv->am = NULL;
     }
 
+  tp_clear_object (&priv->all_active_buffer);
+
   (G_OBJECT_CLASS (empathy_debug_window_parent_class)->dispose) (object);
 }
 
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index 77d11298f..4e00bd11a 100644
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -39,7 +39,8 @@
 
 enum {
   PROP_PARENT = 1,
-  PROP_SHOW_WARNING
+  PROP_SHOW_WARNING,
+  PROP_CMS,
 };
 
 typedef struct {
@@ -48,6 +49,7 @@ typedef struct {
   EmpathyImportWidget *iw;
 
   gboolean show_warning;
+  EmpathyConnectionManagers *cms;
 } EmpathyImportDialogPriv;
 
 G_DEFINE_TYPE (EmpathyImportDialog, empathy_import_dialog, GTK_TYPE_DIALOG)
@@ -62,15 +64,17 @@ import_dialog_add_import_widget (EmpathyImportDialog *self)
 
   area = gtk_dialog_get_content_area (GTK_DIALOG (self));
 
-  iw = empathy_import_widget_new (EMPATHY_IMPORT_APPLICATION_ALL);
+  iw = empathy_import_widget_new (EMPATHY_IMPORT_APPLICATION_ALL, priv->cms);
   widget = empathy_import_widget_get_widget (iw);
-  gtk_box_pack_start (GTK_BOX (area), widget, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (area), widget, TRUE, TRUE, 0);
   gtk_widget_show (widget);
 
   priv->iw = iw;
 
-  gtk_dialog_add_buttons (GTK_DIALOG (self), GTK_STOCK_CANCEL,
-      GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+  gtk_dialog_add_buttons (GTK_DIALOG (self),
+      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+      _("_Import"), GTK_RESPONSE_OK,
+      NULL);
 }
 
 static void
@@ -134,6 +138,9 @@ do_get_property (GObject *object,
     case PROP_SHOW_WARNING:
       g_value_set_boolean (value, priv->show_warning);
       break;
+    case PROP_CMS:
+      g_value_set_object (value, priv->cms);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -155,6 +162,9 @@ do_set_property (GObject *object,
     case PROP_SHOW_WARNING:
       priv->show_warning = g_value_get_boolean (value);
       break;
+    case PROP_CMS:
+      priv->cms = g_value_dup_object (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -199,6 +209,15 @@ empathy_import_dialog_init (EmpathyImportDialog *self)
   gtk_window_set_title (GTK_WINDOW (self), _("Import Accounts"));
   gtk_window_set_modal (GTK_WINDOW (self), TRUE);
 }
+static void
+do_dispose (GObject *obj)
+{
+  EmpathyImportDialogPriv *priv = GET_PRIV (obj);
+
+  g_clear_object (&priv->cms);
+
+  G_OBJECT_CLASS (empathy_import_dialog_parent_class)->dispose (obj);
+}
 
 static void
 empathy_import_dialog_class_init (EmpathyImportDialogClass *klass)
@@ -210,6 +229,7 @@ empathy_import_dialog_class_init (EmpathyImportDialogClass *klass)
   oclass->constructed = do_constructed;
   oclass->get_property = do_get_property;
   oclass->set_property = do_set_property;
+  oclass->dispose = do_dispose;
 
   gtkclass->response = impl_signal_response;
 
@@ -226,13 +246,25 @@ empathy_import_dialog_class_init (EmpathyImportDialogClass *klass)
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
   g_object_class_install_property (oclass, PROP_SHOW_WARNING, param_spec);
 
+  param_spec = g_param_spec_object ("cms",
+      "EmpathyConnectionManagers", "EmpathyConnectionManager",
+      EMPATHY_TYPE_CONNECTION_MANAGERS,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property (oclass, PROP_CMS, param_spec);
+
   g_type_class_add_private (klass, sizeof (EmpathyImportDialogPriv));
 }
 
 GtkWidget *
 empathy_import_dialog_new (GtkWindow *parent,
-    gboolean warning)
+    gboolean warning,
+    EmpathyConnectionManagers *cms)
 {
-  return g_object_new (EMPATHY_TYPE_IMPORT_DIALOG, "parent-window",
-      parent, "show-warning", warning, NULL);
+  g_return_val_if_fail (EMPATHY_IS_CONNECTION_MANAGERS (cms), NULL);
+
+  return g_object_new (EMPATHY_TYPE_IMPORT_DIALOG,
+      "parent-window", parent,
+      "show-warning", warning,
+      "cms", cms,
+      NULL);
 }
diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h
index 0e9d225c4..a412037d1 100644
--- a/src/empathy-import-dialog.h
+++ b/src/empathy-import-dialog.h
@@ -25,6 +25,8 @@
 #ifndef __EMPATHY_IMPORT_DIALOG_H__
 #define __EMPATHY_IMPORT_DIALOG_H__
 
+#include <libempathy/empathy-connection-managers.h>
+
 G_BEGIN_DECLS
 
 #define EMPATHY_TYPE_IMPORT_DIALOG empathy_import_dialog_get_type()
@@ -56,7 +58,8 @@ typedef struct {
 GType empathy_import_dialog_get_type (void);
 
 GtkWidget* empathy_import_dialog_new (GtkWindow *parent_window,
-    gboolean show_warning);
+    gboolean show_warning,
+    EmpathyConnectionManagers *cms);
 
 G_END_DECLS
 
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index aaf20d5c5..041c51003 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -55,7 +55,8 @@ enum
 };
 
 enum {
-  PROP_APPLICATION_ID = 1
+  PROP_APPLICATION_ID = 1,
+  PROP_CMS
 };
 
 typedef struct {
@@ -359,20 +360,6 @@ import_widget_set_up_account_list (EmpathyImportWidget *self)
 }
 
 static void
-import_widget_cms_prepare_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyImportWidget *self = user_data;
-
-  if (!empathy_connection_managers_prepare_finish (
-        EMPATHY_CONNECTION_MANAGERS (source), result, NULL))
-    return;
-
-  import_widget_set_up_account_list (self);
-}
-
-static void
 import_widget_destroy_cb (GtkWidget *w,
     EmpathyImportWidget *self)
 {
@@ -392,6 +379,9 @@ do_get_property (GObject *object,
     case PROP_APPLICATION_ID:
       g_value_set_int (value, priv->app_id);
       break;
+    case PROP_CMS:
+      g_value_set_object (value, priv->cms);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -410,6 +400,9 @@ do_set_property (GObject *object,
     case PROP_APPLICATION_ID:
       priv->app_id = g_value_get_int (value);
       break;
+    case PROP_CMS:
+      priv->cms = g_value_dup_object (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -468,8 +461,7 @@ do_constructed (GObject *obj)
   g_signal_connect (priv->vbox, "destroy",
       G_CALLBACK (import_widget_destroy_cb), self);
 
-  empathy_connection_managers_prepare_async (priv->cms,
-      import_widget_cms_prepare_cb, self);
+  import_widget_set_up_account_list (self);
 }
 
 static void
@@ -490,6 +482,12 @@ empathy_import_widget_class_init (EmpathyImportWidgetClass *klass)
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
   g_object_class_install_property (oclass, PROP_APPLICATION_ID, param_spec);
 
+  param_spec = g_param_spec_object ("cms",
+      "EmpathyConnectionManagers", "EmpathyConnectionManager",
+      EMPATHY_TYPE_CONNECTION_MANAGERS,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property (oclass, PROP_CMS, param_spec);
+
   g_type_class_add_private (klass, sizeof (EmpathyImportWidgetPriv));
 }
 
@@ -501,14 +499,18 @@ empathy_import_widget_init (EmpathyImportWidget *self)
         EmpathyImportWidgetPriv);
 
   self->priv = priv;
-
-  priv->cms = empathy_connection_managers_dup_singleton ();
 }
 
 EmpathyImportWidget *
-empathy_import_widget_new (EmpathyImportApplication id)
+empathy_import_widget_new (EmpathyImportApplication id,
+    EmpathyConnectionManagers *cms)
 {
-  return g_object_new (EMPATHY_TYPE_IMPORT_WIDGET, "application-id", id, NULL);
+  g_return_val_if_fail (EMPATHY_IS_CONNECTION_MANAGERS (cms), NULL);
+
+  return g_object_new (EMPATHY_TYPE_IMPORT_WIDGET,
+      "application-id", id,
+      "cms", cms,
+      NULL);
 }
 
 GtkWidget *
diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h
index 48f2e1d48..14a01d79d 100644
--- a/src/empathy-import-widget.h
+++ b/src/empathy-import-widget.h
@@ -27,6 +27,8 @@
 
 #include <glib-object.h>
 
+#include <libempathy/empathy-connection-managers.h>
+
 #include "empathy-import-utils.h"
 
 G_BEGIN_DECLS
@@ -59,7 +61,8 @@ typedef struct {
 
 GType empathy_import_widget_get_type (void);
 
-EmpathyImportWidget* empathy_import_widget_new (EmpathyImportApplication id);
+EmpathyImportWidget* empathy_import_widget_new (EmpathyImportApplication id,
+    EmpathyConnectionManagers *cms);
 
 GtkWidget * empathy_import_widget_get_widget (EmpathyImportWidget *self);
 
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 6775d4a24..77ec49c26 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -67,7 +67,7 @@ struct _EmpathyPreferencesPriv {
 
 	GtkWidget *checkbutton_show_smileys;
 	GtkWidget *checkbutton_show_contacts_in_rooms;
-	GtkWidget *checkbutton_separate_chat_windows;
+	GtkWidget *radiobutton_chats_new_windows;
 	GtkWidget *checkbutton_events_notif_area;
 	GtkWidget *checkbutton_autoconnect;
 	GtkWidget *checkbutton_logging;
@@ -166,7 +166,7 @@ static SoundEventEntry sound_entries [] = {
 	{ N_("Message received"), EMPATHY_PREFS_SOUNDS_INCOMING_MESSAGE },
 	{ N_("Message sent"), EMPATHY_PREFS_SOUNDS_OUTGOING_MESSAGE },
 	{ N_("New conversation"), EMPATHY_PREFS_SOUNDS_NEW_CONVERSATION },
-	{ N_("Contact goes online"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN },
+	{ N_("Contact comes online"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN },
 	{ N_("Contact goes offline"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGOUT },
 	{ N_("Account connected"), EMPATHY_PREFS_SOUNDS_SERVICE_LOGIN },
 	{ N_("Account disconnected"), EMPATHY_PREFS_SOUNDS_SERVICE_LOGOUT }
@@ -248,7 +248,7 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
 
 	g_settings_bind (priv->gsettings_ui,
 			 EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS,
-			 priv->checkbutton_separate_chat_windows,
+			 priv->radiobutton_chats_new_windows,
 			 "active",
 			 G_SETTINGS_BIND_DEFAULT);
 
@@ -678,7 +678,8 @@ static void
 preferences_preview_theme_append_message (EmpathyChatView *view,
 					  EmpathyContact *sender,
 					  EmpathyContact *receiver,
-					  const gchar *text)
+					  const gchar *text,
+					  gboolean should_highlight)
 {
 	EmpathyMessage *message;
 
@@ -688,7 +689,7 @@ preferences_preview_theme_append_message (EmpathyChatView *view,
 		"body", text,
 		NULL);
 
-	empathy_chat_view_append_message (view, message);
+	empathy_chat_view_append_message (view, message, should_highlight);
 	g_object_unref (message);
 }
 
@@ -735,19 +736,20 @@ preferences_preview_theme_changed_cb (EmpathyThemeManager *manager,
 
 	preferences_preview_theme_append_message (priv->chat_theme_preview,
 		/* translators: Quote from Romeo & Julier, for chat theme preview */
-		juliet, romeo, _("O Romeo, Romeo, wherefore art thou Romeo?"));
+		juliet, romeo, _("O Romeo, Romeo, wherefore art thou Romeo?"),
+		TRUE /* this message mentions Romeo */);
 	preferences_preview_theme_append_message (priv->chat_theme_preview,
 		/* translators: Quote from Romeo & Julier, for chat theme preview */
-		juliet, romeo, _("Deny thy father and refuse thy name;"));
+		juliet, romeo, _("Deny thy father and refuse thy name;"), FALSE);
 	preferences_preview_theme_append_message (priv->chat_theme_preview,
 		/* translators: Quote from Romeo & Julier, for chat theme preview */
-		juliet, romeo, _("Or if thou wilt not, be but sworn my love"));
+		juliet, romeo, _("Or if thou wilt not, be but sworn my love"), FALSE);
 	preferences_preview_theme_append_message (priv->chat_theme_preview,
 		/* translators: Quote from Romeo & Julier, for chat theme preview */
-		juliet, romeo, _("And I'll no longer be a Capulet."));
+		juliet, romeo, _("And I'll no longer be a Capulet."), FALSE);
 	preferences_preview_theme_append_message (priv->chat_theme_preview,
 		/* translators: Quote from Romeo & Julier, for chat theme preview */
-		romeo, juliet, _("Shall I hear more, or shall I speak at this?"));
+		romeo, juliet, _("Shall I hear more, or shall I speak at this?"), FALSE);
 
 	/* translators: Quote from Romeo & Julier, for chat theme preview */
 	empathy_chat_view_append_event (priv->chat_theme_preview, _("Juliet has disconnected"));
@@ -1170,7 +1172,7 @@ empathy_preferences_init (EmpathyPreferences *preferences)
 		"combobox_chat_theme_variant", &priv->combobox_chat_theme_variant,
 		"hbox_chat_theme_variant", &priv->hbox_chat_theme_variant,
 		"sw_chat_theme_preview", &priv->sw_chat_theme_preview,
-		"checkbutton_separate_chat_windows", &priv->checkbutton_separate_chat_windows,
+		"radiobutton_chats_new_windows", &priv->radiobutton_chats_new_windows,
 		"checkbutton_events_notif_area", &priv->checkbutton_events_notif_area,
 		"checkbutton_autoconnect", &priv->checkbutton_autoconnect,
 		"checkbutton_logging", &priv->checkbutton_logging,
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index 03a628cb6..f13f6c0b2 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -107,14 +107,47 @@
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkCheckButton" id="checkbutton_separate_chat_windows">
-                        <property name="label" translatable="yes">_Open new chats in separate windows</property>
+                      <object class="GtkBox" id="vbox2180">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">horizontal</property>
+                        <property name="spacing">3</property>
+                        <child>
+                          <object class="GtkLabel" id="label1000">
+                            <property name="label" translatable="yes">Start chats in:</property>
+                            <property name="visible">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="radiobutton_chats_new_tabs">
+                            <property name="label" translatable="yes">new ta_bs</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="radiobutton_chats_new_windows">
+                            <property name="label" translatable="yes">new _windows</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">radiobutton_chats_new_tabs</property>
+                          </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/src/empathy-roster-window-menubar.ui b/src/empathy-roster-window-menubar.ui
index 0bb5d14f0..d342abca8 100644
--- a/src/empathy-roster-window-menubar.ui
+++ b/src/empathy-roster-window-menubar.ui
@@ -109,12 +109,6 @@
           <accelerator key="F4" modifiers=""/>
         </child>
         <child>
-          <object class="GtkAction" id="edit_personal_information">
-            <property name="name">edit_personal_information</property>
-            <property name="label" translatable="yes">_Personal Information</property>
-          </object>
-        </child>
-        <child>
           <object class="GtkAction" id="edit_blocked_contacts">
             <property name="name">edit_blocked_contacts</property>
             <property name="label" translatable="yes">_Blocked Contacts</property>
@@ -263,7 +257,6 @@
           <menuitem action="edit_context"/>
           <separator name="edit_context_separator"/>
           <menuitem action="edit_accounts"/>
-          <menuitem action="edit_personal_information"/>
           <menuitem action="edit_search_contacts"/>
           <menuitem action="edit_blocked_contacts"/>
           <separator/>
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index f45474cf2..454cd256a 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -92,7 +92,7 @@
 enum
 {
   PAGE_CONTACT_LIST = 0,
-  PAGE_NO_MATCH
+  PAGE_MESSAGE
 };
 
 enum
@@ -111,6 +111,7 @@ struct _EmpathyRosterWindowPriv {
   EmpathyEventManager *event_manager;
   EmpathySoundManager *sound_mgr;
   EmpathyCallObserver *call_observer;
+  EmpathyIndividualManager *individual_manager;
   guint flash_timeout_id;
   gboolean flash_on;
   gboolean empty;
@@ -129,6 +130,8 @@ struct _EmpathyRosterWindowPriv {
   GtkWidget *search_bar;
   GtkWidget *notebook;
   GtkWidget *no_entry_label;
+  GtkWidget *button_account_settings;
+  GtkWidget *spinner_loading;
 
   GtkToggleAction *show_protocols;
   GtkRadioAction *sort_by_name;
@@ -608,6 +611,53 @@ OUT:
 }
 
 static void
+button_account_settings_clicked_cb (GtkButton *button,
+    EmpathyRosterWindow *self)
+{
+  empathy_accounts_dialog_show_application (gdk_screen_get_default (),
+      NULL, FALSE, FALSE);
+}
+
+static void
+display_page_message (EmpathyRosterWindow *self,
+    const gchar *msg,
+    gboolean display_accounts_button,
+    gboolean display_spinner)
+{
+  if (msg != NULL)
+    {
+      gchar *tmp;
+
+      tmp = g_strdup_printf ("<b><span size='xx-large'>%s</span></b>", msg);
+
+      gtk_label_set_markup (GTK_LABEL (self->priv->no_entry_label), tmp);
+      g_free (tmp);
+
+      gtk_label_set_line_wrap (GTK_LABEL (self->priv->no_entry_label), TRUE);
+      gtk_widget_show (self->priv->no_entry_label);
+    }
+  else
+    {
+      gtk_widget_hide (self->priv->no_entry_label);
+    }
+
+  gtk_widget_set_visible (self->priv->button_account_settings,
+      display_accounts_button);
+  gtk_widget_set_visible (self->priv->spinner_loading,
+      display_spinner);
+
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook),
+      PAGE_MESSAGE);
+}
+
+static void
+display_page_no_account (EmpathyRosterWindow *self)
+{
+  display_page_message (self,
+      _("You need to setup an account to see contacts here."), TRUE, FALSE);
+}
+
+static void
 roster_window_row_deleted_cb (GtkTreeModel *model,
     GtkTreePath *path,
     EmpathyRosterWindow *self)
@@ -620,24 +670,24 @@ roster_window_row_deleted_cb (GtkTreeModel *model,
 
       if (empathy_individual_view_is_searching (self->priv->individual_view))
         {
-          gchar *tmp;
-
-          tmp = g_strdup_printf ("<b><span size='xx-large'>%s</span></b>",
-              _("No match found"));
-
-          gtk_label_set_markup (GTK_LABEL (self->priv->no_entry_label), tmp);
-          g_free (tmp);
-
-          gtk_label_set_line_wrap (GTK_LABEL (self->priv->no_entry_label),
-              TRUE);
-
-          gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook),
-              PAGE_NO_MATCH);
+          display_page_message (self, _("No match found"), FALSE, FALSE);
         }
     }
 }
 
 static void
+display_page_contact_list (EmpathyRosterWindow *self)
+{
+  if (!empathy_individual_manager_get_contacts_loaded (
+        self->priv->individual_manager))
+    /* We'll display the contact list once we're done loading */
+    return;
+
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook),
+      PAGE_CONTACT_LIST);
+}
+
+static void
 roster_window_row_inserted_cb (GtkTreeModel      *model,
     GtkTreePath *path,
     GtkTreeIter *iter,
@@ -646,8 +696,8 @@ roster_window_row_inserted_cb (GtkTreeModel      *model,
   if (self->priv->empty)
     {
       self->priv->empty = FALSE;
-      gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook),
-          PAGE_CONTACT_LIST);
+
+      display_page_contact_list (self);
       gtk_widget_grab_focus (GTK_WIDGET (self->priv->individual_view));
 
       /* The store is being filled, it will be done after an idle cb.
@@ -1376,6 +1426,7 @@ empathy_roster_window_finalize (GObject *window)
 
   g_object_unref (self->priv->gsettings_ui);
   g_object_unref (self->priv->gsettings_contacts);
+  g_object_unref (self->priv->individual_manager);
 
   G_OBJECT_CLASS (empathy_roster_window_parent_class)->finalize (window);
 }
@@ -1941,13 +1992,6 @@ roster_window_edit_accounts_cb (GtkAction *action,
 }
 
 static void
-roster_window_edit_personal_information_cb (GtkAction *action,
-    EmpathyRosterWindow *self)
-{
-  empathy_contact_personal_dialog_show (GTK_WINDOW (self));
-}
-
-static void
 roster_window_edit_blocked_contacts_cb (GtkAction *action,
     EmpathyRosterWindow *self)
 {
@@ -2095,6 +2139,81 @@ add_account (EmpathyRosterWindow *self,
   roster_window_setup_balance (self, account);
 }
 
+/* @account: if not %NULL, the only account which can be enabled */
+static void
+display_page_account_not_enabled (EmpathyRosterWindow *self,
+    TpAccount *account)
+{
+  if (account == NULL)
+    {
+      display_page_message (self,
+          _("You need to enable one of your accounts to see contacts here."),
+          TRUE, FALSE);
+    }
+  else
+    {
+      gchar *tmp;
+
+      /* translators: argument is an account name */
+      tmp = g_strdup_printf (_("You need to enable %s to see contacts here."),
+          tp_account_get_display_name (account));
+
+      display_page_message (self, tmp, TRUE, FALSE);
+      g_free (tmp);
+    }
+}
+static gboolean
+has_enabled_account (GList *accounts)
+{
+  GList *l;
+
+  for (l = accounts; l != NULL; l = g_list_next (l))
+    {
+      TpAccount *account = l->data;
+
+      if (tp_account_is_enabled (account))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+set_notebook_page (EmpathyRosterWindow *self)
+{
+  GList *accounts;
+  guint len;
+
+  accounts = tp_account_manager_get_valid_accounts (
+      self->priv->account_manager);
+
+  len = g_list_length (accounts);
+
+  if (len == 0)
+    {
+      /* No account */
+      display_page_no_account (self);
+      goto out;
+    }
+
+  if (!has_enabled_account (accounts))
+    {
+      TpAccount *account = NULL;
+
+      /* Pass the account if there is only one which can be enabled */
+      if (len == 1)
+        account = accounts->data;
+
+      display_page_account_not_enabled (self, account);
+      goto out;
+    }
+
+  display_page_contact_list (self);
+
+out:
+  g_list_free (accounts);
+}
+
 static void
 roster_window_account_validity_changed_cb (TpAccountManager  *manager,
     TpAccount *account,
@@ -2105,6 +2224,8 @@ roster_window_account_validity_changed_cb (TpAccountManager  *manager,
     add_account (self, account);
   else
     roster_window_account_removed_cb (manager, account, self);
+
+  set_notebook_page (self);
 }
 
 static void
@@ -2130,7 +2251,6 @@ roster_window_connection_items_setup (EmpathyRosterWindow *self,
       "chat_new_call",
       "chat_search_contacts",
       "chat_add_contact",
-      "edit_personal_information",
       "edit_blocked_contacts",
       "edit_search_contacts"
   };
@@ -2145,6 +2265,22 @@ roster_window_connection_items_setup (EmpathyRosterWindow *self,
 }
 
 static void
+account_enabled_cb (TpAccountManager *manager,
+    TpAccount *account,
+    EmpathyRosterWindow *self)
+{
+  set_notebook_page (self);
+}
+
+static void
+account_disabled_cb (TpAccountManager *manager,
+    TpAccount *account,
+    EmpathyRosterWindow *self)
+{
+  set_notebook_page (self);
+}
+
+static void
 account_manager_prepared_cb (GObject *source_object,
     GAsyncResult *result,
     gpointer user_data)
@@ -2171,6 +2307,10 @@ account_manager_prepared_cb (GObject *source_object,
 
   g_signal_connect (manager, "account-validity-changed",
       G_CALLBACK (roster_window_account_validity_changed_cb), self);
+  tp_g_signal_connect_object (manager, "account-disabled",
+      G_CALLBACK (account_disabled_cb), self, 0);
+  tp_g_signal_connect_object (manager, "account-enabled",
+      G_CALLBACK (account_enabled_cb), self, 0);
 
   roster_window_update_status (self);
 
@@ -2178,6 +2318,8 @@ account_manager_prepared_cb (GObject *source_object,
   gtk_action_set_sensitive (self->priv->view_history,
       g_list_length (accounts) > 0);
 
+  set_notebook_page (self);
+
   g_list_free (accounts);
 }
 
@@ -2271,9 +2413,31 @@ empathy_roster_window_class_init (EmpathyRosterWindowClass *klass)
 }
 
 static void
+show_contacts_loading (EmpathyRosterWindow *self)
+{
+  display_page_message (self, NULL, FALSE, TRUE);
+
+  gtk_spinner_start (GTK_SPINNER (self->priv->spinner_loading));
+}
+
+static void
+hide_contacts_loading (EmpathyRosterWindow *self)
+{
+  gtk_spinner_stop (GTK_SPINNER (self->priv->spinner_loading));
+
+  display_page_contact_list (self);
+}
+
+static void
+contacts_loaded_cb (EmpathyIndividualManager *manager,
+    EmpathyRosterWindow *self)
+{
+  hide_contacts_loading (self);
+}
+
+static void
 empathy_roster_window_init (EmpathyRosterWindow *self)
 {
-  EmpathyIndividualManager *individual_manager;
   GtkBuilder *gui, *gui_mgr;
   GtkWidget *sw;
   GtkToggleAction *show_offline_widget;
@@ -2313,6 +2477,8 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
       "notebook", &self->priv->notebook,
       "no_entry_label", &self->priv->no_entry_label,
       "roster_scrolledwindow", &sw,
+      "button_account_settings", &self->priv->button_account_settings,
+      "spinner_loading", &self->priv->spinner_loading,
       NULL);
   g_free (filename);
 
@@ -2365,7 +2531,6 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
       "view_show_map", "activate", roster_window_view_show_map_cb,
       "edit", "activate", roster_window_edit_cb,
       "edit_accounts", "activate", roster_window_edit_accounts_cb,
-      "edit_personal_information", "activate", roster_window_edit_personal_information_cb,
       "edit_blocked_contacts", "activate", roster_window_edit_blocked_contacts_cb,
       "edit_preferences", "activate", roster_window_edit_preferences_cb,
       "edit_search_contacts", "activate", roster_window_edit_search_contacts_cb,
@@ -2442,10 +2607,19 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
    * so it's got a race condition between its signal handlers and its
    * finalization. The class is planned to be removed, so we won't fix
    * this before then. */
-  individual_manager = empathy_individual_manager_dup_singleton ();
+  self->priv->individual_manager = empathy_individual_manager_dup_singleton ();
+
+  if (!empathy_individual_manager_get_contacts_loaded (
+        self->priv->individual_manager))
+    {
+      show_contacts_loading (self);
+
+      tp_g_signal_connect_object (self->priv->individual_manager,
+          "contacts-loaded", G_CALLBACK (contacts_loaded_cb), self, 0);
+    }
+
   self->priv->individual_store = EMPATHY_INDIVIDUAL_STORE (
-      empathy_individual_store_manager_new (individual_manager));
-  g_object_unref (individual_manager);
+      empathy_individual_store_manager_new (self->priv->individual_manager));
 
   /* For the moment, we disallow Persona drops onto the roster contact list
    * (e.g. from things such as the EmpathyPersonaView in the linking dialogue).
@@ -2469,7 +2643,6 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
       EMPATHY_INDIVIDUAL_FEATURE_CALL |
       EMPATHY_INDIVIDUAL_FEATURE_EDIT |
       EMPATHY_INDIVIDUAL_FEATURE_INFO |
-      EMPATHY_INDIVIDUAL_FEATURE_LINK |
       EMPATHY_INDIVIDUAL_FEATURE_SMS |
       EMPATHY_INDIVIDUAL_FEATURE_CALL_PHONE);
 
@@ -2512,6 +2685,9 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
       self->priv->balance_vbox, "visible",
       G_BINDING_SYNC_CREATE);
 
+  g_settings_bind (self->priv->gsettings_ui, "show-groups",
+      self->priv->individual_store, "show-groups", G_SETTINGS_BIND_DEFAULT);
+
   /* Enable event handling */
   self->priv->call_observer = empathy_call_observer_dup_singleton ();
   self->priv->event_manager = empathy_event_manager_dup_singleton ();
@@ -2565,6 +2741,9 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
 
   roster_window_notify_contact_list_size_cb (self->priv->gsettings_ui,
       EMPATHY_PREFS_UI_SHOW_AVATARS, self);
+
+  g_signal_connect (self->priv->button_account_settings, "clicked",
+      G_CALLBACK (button_account_settings_clicked_cb), self);
 }
 
 GtkWidget *
diff --git a/src/empathy-roster-window.ui b/src/empathy-roster-window.ui
index a09d123f8..8c8f63001 100644
--- a/src/empathy-roster-window.ui
+++ b/src/empathy-roster-window.ui
@@ -91,10 +91,82 @@
           </object>
         </child>
         <child>
-          <object class="GtkLabel" id="no_entry_label">
+          <object class="GtkBox" id="box1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="yalign">0.30000001192092896</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkImage" id="image1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="yalign">1</property>
+                <property name="ypad">1</property>
+                <property name="icon_name">avatar-default</property>
+                <property name="icon-size">6</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="no_entry_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="yalign">0.30000001192092896</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="yalign">0</property>
+                <property name="xscale">0</property>
+                <property name="yscale">0</property>
+                <child>
+                  <object class="GtkButton" id="button_account_settings">
+                    <property name="label" translatable="yes">Account settings</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="margin_left">6</property>
+                    <property name="margin_right">6</property>
+                    <property name="use_action_appearance">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="yalign">0</property>
+                <property name="xscale">0</property>
+                <property name="yscale">0</property>
+                <child>
+                  <object class="GtkSpinner" id="spinner_loading">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="position">1</property>
diff --git a/src/empathy-rounded-actor.c b/src/empathy-rounded-actor.c
index 0537dea96..045f08de7 100644
--- a/src/empathy-rounded-actor.c
+++ b/src/empathy-rounded-actor.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 
 #include <clutter/clutter.h>
 #include <clutter-gtk/clutter-gtk.h>
diff --git a/src/empathy-rounded-rectangle.c b/src/empathy-rounded-rectangle.c
index e06889d58..4cce28b06 100644
--- a/src/empathy-rounded-rectangle.c
+++ b/src/empathy-rounded-rectangle.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <math.h>
 
 #include <clutter/clutter.h>
diff --git a/tests/empathy-irc-network-manager-test.c b/tests/empathy-irc-network-manager-test.c
index df1147070..ba01c3782 100644
--- a/tests/empathy-irc-network-manager-test.c
+++ b/tests/empathy-irc-network-manager-test.c
@@ -33,9 +33,9 @@ test_empathy_irc_network_manager_add (void)
   g_object_unref (network);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  g_assert (g_slist_length (networks) == 1);
+  g_assert_cmpuint (g_slist_length (networks), ==, 1);
   g_object_get (networks->data, "name", &name, NULL);
-  g_assert (name != NULL && strcmp (name, "My Network") == 0);
+  g_assert_cmpstr (name, ==, "My Network");
   g_free (name);
   g_slist_foreach (networks, (GFunc) g_object_unref, NULL);
   g_slist_free (networks);
@@ -47,12 +47,12 @@ test_empathy_irc_network_manager_add (void)
   g_object_unref (network);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  g_assert (g_slist_length (networks) == 2);
+  g_assert_cmpuint (g_slist_length (networks), ==, 2);
   g_object_get (networks->data, "name", &name, NULL);
-  g_assert (name != NULL && strcmp (name, "My Network") == 0);
+  g_assert_cmpstr (name, ==, "My Network");
   g_free (name);
   g_object_get (g_slist_next (networks)->data, "name", &name, NULL);
-  g_assert (name != NULL || strcmp (name, "My Network") == 0);
+  g_assert_cmpstr (name, ==, "My Network");
   g_free (name);
   g_slist_foreach (networks, (GFunc) g_object_unref, NULL);
   g_slist_free (networks);
@@ -86,14 +86,13 @@ test_load_global_file (void)
       "global-file", &global_file,
       "user-file", &user_file,
       NULL);
-  g_assert (global_file != NULL || strcmp (global_file, global_file_orig) == 0);
-  g_assert (user_file == NULL);
+  g_assert_cmpstr (global_file, ==, global_file_orig);
   g_free (global_file);
   g_free (global_file_orig);
   g_free (user_file);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  g_assert (g_slist_length (networks) == 4);
+  g_assert_cmpuint (g_slist_length (networks), ==, 4);
 
   network_checked[0] = network_checked[1] = network_checked[2] =
     network_checked[3] = FALSE;
@@ -197,7 +196,7 @@ test_empathy_irc_network_manager_remove (void)
   g_assert (result);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  g_assert (g_slist_length (networks) == 3);
+  g_assert_cmpuint (g_slist_length (networks), ==, 3);
 
   network_checked[0] = network_checked[1] = network_checked[2] = FALSE;
   /* check networks and servers */
@@ -263,13 +262,13 @@ test_load_user_file (void)
       "user-file", &user_file,
       NULL);
   g_assert (global_file == NULL);
-  g_assert (user_file != NULL && strcmp (user_file, user_file_orig) == 0);
+  g_assert_cmpstr (user_file, ==, user_file_orig);
   g_free (global_file);
   g_free (user_file);
   g_free (user_file_orig);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  g_assert (g_slist_length (networks) == 3);
+  g_assert_cmpuint (g_slist_length (networks), ==, 3);
 
   network_checked[0] = network_checked[1] = network_checked[2] = FALSE;
   /* check networks and servers */
@@ -339,15 +338,15 @@ test_load_both_files (void)
       "global-file", &global_file,
       "user-file", &user_file,
       NULL);
-  g_assert (global_file != NULL && strcmp (global_file, global_file_orig) == 0);
-  g_assert (user_file != NULL && strcmp (user_file, user_file_orig) == 0);
+  g_assert_cmpstr (global_file, ==, global_file_orig);
+  g_assert_cmpstr (user_file, ==, user_file_orig);
   g_free (global_file);
   g_free (global_file_orig);
   g_free (user_file);
   g_free (user_file_orig);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  g_assert (g_slist_length (networks) == 5);
+  g_assert_cmpuint (g_slist_length (networks), ==, 5);
 
   network_checked[0] = network_checked[1] = network_checked[2] =
     network_checked[3] = network_checked[4] = FALSE;
@@ -427,12 +426,12 @@ test_modify_user_file (void)
       "user-file", &user_file,
       NULL);
   g_assert (global_file == NULL);
-  g_assert (user_file != NULL && strcmp (user_file, user_file_orig) == 0);
+  g_assert_cmpstr (user_file, ==, user_file_orig);
   g_free (global_file);
   g_free (user_file);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  g_assert (g_slist_length (networks) == 3);
+  g_assert_cmpuint (g_slist_length (networks), ==, 3);
 
   network_modified[0] = network_modified[1] = FALSE;
   /* check networks and servers */
@@ -523,7 +522,7 @@ test_modify_user_file (void)
   g_free (user_file_orig);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  g_assert (g_slist_length (networks) == 3);
+  g_assert_cmpuint (g_slist_length (networks), ==, 3);
 
   network_checked[0] = network_checked[1] = network_checked[2] = FALSE;
   /* check networks and servers */
@@ -594,15 +593,15 @@ test_modify_both_files (void)
       "global-file", &global_file,
       "user-file", &user_file,
       NULL);
-  g_assert (global_file != NULL && strcmp (global_file, global_file_orig) == 0);
-  g_assert (user_file != NULL && strcmp (user_file, user_file_orig) == 0);
+  g_assert_cmpstr (global_file, ==, global_file_orig);
+  g_assert_cmpstr (user_file, ==, user_file_orig);
   g_free (global_file);
   g_free (global_file_orig);
   g_free (user_file);
   g_free (user_file_orig);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  g_assert (g_slist_length (networks) == 5);
+  g_assert_cmpuint (g_slist_length (networks), ==, 5);
 
   network_modified[0] = network_modified[1] = network_modified[2] =
     network_modified[3] = FALSE;
@@ -711,7 +710,7 @@ test_modify_both_files (void)
   g_free (user_file_orig);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  g_assert (g_slist_length (networks) == 4);
+  g_assert_cmpuint (g_slist_length (networks), ==, 4);
 
   network_checked[0] = network_checked[1] = network_checked[2] =
     network_checked[3] = FALSE;
@@ -811,7 +810,7 @@ test_no_modify_with_empty_user_file (void)
   g_free (user_file_orig);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  g_assert (g_slist_length (networks) == 0);
+  g_assert_cmpuint (g_slist_length (networks), ==, 0);
 
   g_slist_foreach (networks, (GFunc) g_object_unref, NULL);
   g_slist_free (networks);
diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c
index 8256da477..58c53dc6b 100644
--- a/tests/empathy-tls-test.c
+++ b/tests/empathy-tls-test.c
@@ -454,9 +454,10 @@ test_certificate_verify_success_with_pkcs11_lookup (Test *test,
       reference_identities);
   empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test);
   g_main_loop_run (test->loop);
-  if (!empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
-          NULL, &error))
-    g_assert_not_reached ();
+
+  empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
+      NULL, &error);
+  g_assert_no_error (error);
 
   /* Yay the verification was a success! */
 
@@ -494,9 +495,9 @@ test_certificate_verify_success_with_full_chain (Test *test,
       reference_identities);
   empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test);
   g_main_loop_run (test->loop);
-  if (!empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
-          NULL, &error))
-    g_assert_not_reached ();
+  empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
+      NULL, &error);
+  g_assert_no_error (error);
 
   /* Yay the verification was a success! */
 
@@ -528,12 +529,12 @@ test_certificate_verify_root_not_found (Test *test,
   empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test);
   g_main_loop_run (test->loop);
 
-  if (empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
-          NULL, &error))
-    g_assert_not_reached ();
+  empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
+      NULL, &error);
 
   /* And it should say we're self-signed (oddly enough) */
-  g_assert_cmpuint (reason, ==, EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED);
+  g_assert_error (error, G_IO_ERROR,
+      EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED);
 
   g_clear_error (&error);
   g_object_unref (verifier);
@@ -563,12 +564,12 @@ test_certificate_verify_root_not_anchored (Test *test,
   empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test);
   g_main_loop_run (test->loop);
 
-  if (empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
-          NULL, &error))
-    g_assert_not_reached ();
+  empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
+      NULL, &error);
 
   /* And it should say we're self-signed (oddly enough) */
-  g_assert_cmpuint (reason, ==, EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED);
+  g_assert_error (error, G_IO_ERROR,
+      EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED);
 
   g_clear_error (&error);
   g_object_unref (verifier);
@@ -600,12 +601,12 @@ test_certificate_verify_identities_invalid (Test *test,
   empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test);
   g_main_loop_run (test->loop);
 
-  if (empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
-          NULL, &error))
-    g_assert_not_reached ();
+  empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
+      NULL, &error);
 
   /* And it should say we're self-signed (oddly enough) */
-  g_assert_cmpuint (reason, ==, EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH);
+  g_assert_error (error, G_IO_ERROR,
+      EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH);
 
   g_clear_error (&error);
   g_object_unref (verifier);
@@ -638,12 +639,12 @@ test_certificate_verify_uses_reference_identities (Test *test,
   empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test);
   g_main_loop_run (test->loop);
 
-  if (empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
-          NULL, &error))
-    g_assert_not_reached ();
+  empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
+      NULL, &error);
 
   /* And it should say we're self-signed (oddly enough) */
-  g_assert_cmpuint (reason, ==, EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH);
+  g_assert_error (error, G_IO_ERROR,
+      EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH);
 
   g_clear_error (&error);
   g_object_unref (verifier);
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index e07ed65f7..bb0f41548 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -15,7 +15,6 @@ LDADD =								\
 
 noinst_PROGRAMS =			\
 	empathy-logs			\
-	test-empathy-account-assistant \
 	test-empathy-contact-blocking-dialog \
 	test-empathy-presence-chooser	\
 	test-empathy-status-preset-dialog \
@@ -27,14 +26,4 @@ test_empathy_contact_blocking_dialog_SOURCES = test-empathy-contact-blocking-dia
 test_empathy_presence_chooser_SOURCES = test-empathy-presence-chooser.c
 test_empathy_status_preset_dialog_SOURCES = test-empathy-status-preset-dialog.c
 test_empathy_protocol_chooser_SOURCES = test-empathy-protocol-chooser.c
-test_empathy_account_assistant_SOURCES = test-empathy-account-assistant.c
 test_empathy_account_chooser_SOURCES = test-empathy-account-chooser.c
-
-test_empathy_account_assistant_CFLAGS = -I$(top_srcdir)/src
-test_empathy_account_assistant_LDADD = 			\
-	$(top_builddir)/src/empathy-account-assistant.lo	\
-	$(top_builddir)/src/empathy-auto-salut-account-helper.lo	\
-	$(top_builddir)/src/empathy-import-pidgin.lo	\
-	$(top_builddir)/src/empathy-import-utils.lo	\
-	$(top_builddir)/src/empathy-import-widget.lo	\
-	$(LDADD)
diff --git a/tests/interactive/test-empathy-account-assistant.c b/tests/interactive/test-empathy-account-assistant.c
deleted file mode 100644
index dc04c7027..000000000
--- a/tests/interactive/test-empathy-account-assistant.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <config.h>
-
-#include <gtk/gtk.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include "empathy-account-assistant.h"
-
-static void
-managers_prepare_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  GtkWidget *assistant;
-  EmpathyConnectionManagers *managers = EMPATHY_CONNECTION_MANAGERS (source);
-
-  g_assert (empathy_connection_managers_prepare_finish (managers, result,
-        NULL));
-
-  assistant = empathy_account_assistant_show (NULL, managers);
-
-  gtk_widget_show_all (assistant);
-
-  g_signal_connect_swapped (assistant, "destroy",
-      G_CALLBACK (gtk_main_quit), NULL);
-}
-
-int main (int argc, char **argv)
-{
-  EmpathyConnectionManagers *managers;
-
-  gtk_init (&argc, &argv);
-  empathy_gtk_init ();
-
-  managers = empathy_connection_managers_dup_singleton ();
-
-  empathy_connection_managers_prepare_async (managers,
-      managers_prepare_cb, NULL);
-
-  gtk_main ();
-
-  return 0;
-}